diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 3f328189d33..1362c42c0dd 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2242,9 +2242,9 @@ public class MyComponent : ComponentBase
         AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
         AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
         CompileToAssembly(generated, designTime ? [] : [
-                    // (29,55): error CS0120: An object reference is required for the non-static field, method, or property 'MyComponent.Value'
+                    // (21,55): error CS0120: An object reference is required for the non-static field, method, or property 'MyComponent.Value'
                     //             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
-                    Diagnostic(ErrorCode.ERR_ObjectRequired, "global::Test.MyComponent.\r\n#nullable restore\r\n#line (1,14)-(1,19) \"x:\\dir\\subdir\\Test\\TestComponent.cshtml\"\r\nValue").WithArguments("Test.MyComponent.Value").WithLocation(29, 55)
+                    Diagnostic(ErrorCode.ERR_ObjectRequired, "global::Test.MyComponent.\r\n#nullable restore\r\n#line (1,14)-(1,19) \"x:\\dir\\subdir\\Test\\TestComponent.cshtml\"\r\nValue").WithArguments("Test.MyComponent.Value").WithLocation(21, 55)
             ]);
     }
 
@@ -2462,12 +2462,12 @@ public class MyComponent : ComponentBase
         AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
         AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
         CompileToAssembly(generated, designTime ? [] : [
-                // (29,55): error CS0120: An object reference is required for the non-static field, method, or property 'MyComponent.Value'
+                // (21,55): error CS0120: An object reference is required for the non-static field, method, or property 'MyComponent.Value'
                 //             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
-                Diagnostic(ErrorCode.ERR_ObjectRequired, "global::Test.MyComponent.\r\n#nullable restore\r\n#line (1,20)-(1,25) \"x:\\dir\\subdir\\Test\\TestComponent.cshtml\"\r\nValue").WithArguments("Test.MyComponent.Value").WithLocation(29, 55),
-                // (46,55): error CS0120: An object reference is required for the non-static field, method, or property 'MyComponent.ValueChanged'
+                Diagnostic(ErrorCode.ERR_ObjectRequired, "global::Test.MyComponent.\r\n#nullable restore\r\n#line (1,20)-(1,25) \"x:\\dir\\subdir\\Test\\TestComponent.cshtml\"\r\nValue").WithArguments("Test.MyComponent.Value").WithLocation(21, 55),
+                // (38,55): error CS0120: An object reference is required for the non-static field, method, or property 'MyComponent.ValueChanged'
                 //             __builder.AddComponentParameter(2, nameof(global::Test.MyComponent.ValueChanged), (global::System.Action<System.Int32>)(__value => ParentValue = __value));
-                Diagnostic(ErrorCode.ERR_ObjectRequired, "global::Test.MyComponent.ValueChanged").WithArguments("Test.MyComponent.ValueChanged").WithLocation(46, 55)
+                Diagnostic(ErrorCode.ERR_ObjectRequired, "global::Test.MyComponent.ValueChanged").WithArguments("Test.MyComponent.ValueChanged").WithLocation(38, 55)
             ]);
     }
 
@@ -2625,9 +2625,9 @@ public class MyComponent : ComponentBase
             : [// x:\dir\subdir\Test\TestComponent.cshtml(1,27): error CS1503: Argument 1: cannot convert from 'string' to 'int'
                // ParentValue
                Diagnostic(ErrorCode.ERR_BadArgType, "ParentValue").WithArguments("1", "string", "int").WithLocation(1, 27),
-               // (46,166): error CS0029: Cannot implicitly convert type 'int' to 'string'
+               // (38,166): error CS0029: Cannot implicitly convert type 'int' to 'string'
                //             __builder.AddComponentParameter(2, nameof(global::Test.MyComponent.ValueChanged), (global::System.Action<global::System.Int32>)(__value => ParentValue = __value));
-               Diagnostic(ErrorCode.ERR_NoImplicitConv, "__value").WithArguments("int", "string").WithLocation(46, 166)]);
+               Diagnostic(ErrorCode.ERR_NoImplicitConv, "__value").WithArguments("int", "string").WithLocation(38, 166)]);
     }
 
     [IntegrationTestFact]
@@ -2704,9 +2704,9 @@ public class MyComponent : ComponentBase
             : [// x:\dir\subdir\Test\TestComponent.cshtml(1,27): error CS1503: Argument 1: cannot convert from 'string' to 'int'
                //                           ParentValue
                Diagnostic(ErrorCode.ERR_BadArgType, "ParentValue").WithArguments("1", "string", "int").WithLocation(1, 27),
-               // (46,351): error CS1503: Argument 2: cannot convert from 'Microsoft.AspNetCore.Components.EventCallback<string>' to 'Microsoft.AspNetCore.Components.EventCallback'
+               // (38,351): error CS1503: Argument 2: cannot convert from 'Microsoft.AspNetCore.Components.EventCallback<string>' to 'Microsoft.AspNetCore.Components.EventCallback'
                //             global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)));
-               Diagnostic(ErrorCode.ERR_BadArgType, "global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)").WithArguments("2", "Microsoft.AspNetCore.Components.EventCallback<string>", "Microsoft.AspNetCore.Components.EventCallback").WithLocation(46, 351)
+               Diagnostic(ErrorCode.ERR_BadArgType, "global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => ParentValue = __value, ParentValue)").WithArguments("2", "Microsoft.AspNetCore.Components.EventCallback<string>", "Microsoft.AspNetCore.Components.EventCallback").WithLocation(38, 351)
             ]
         );
     }
@@ -2911,12 +2911,12 @@ public class MyComponent : ComponentBase
                // (38,195): error CS1662: Cannot convert lambda expression to intended delegate type because some of the return types in the block are not implicitly convertible to the delegate return type
                //             __o = global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Linq.Expressions.Expression<global::System.Func<global::System.String>>>(() => ParentValue);
                Diagnostic(ErrorCode.ERR_CantConvAnonMethReturns, "ParentValue").WithArguments("lambda expression").WithLocation(38, 195)]
-            : [// (47,274): error CS0029: Cannot implicitly convert type 'int' to 'string'
+            : [// (39,274): error CS0029: Cannot implicitly convert type 'int' to 'string'
                //             __builder.AddComponentParameter(3, nameof(global::Test.MyComponent.ValueExpression), global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Linq.Expressions.Expression<global::System.Func<global::System.String>>>(() => ParentValue));
-               Diagnostic(ErrorCode.ERR_NoImplicitConv, "ParentValue").WithArguments("int", "string").WithLocation(47, 274),
-               // (47,274): error CS1662: Cannot convert lambda expression to intended delegate type because some of the return types in the block are not implicitly convertible to the delegate return type
+               Diagnostic(ErrorCode.ERR_NoImplicitConv, "ParentValue").WithArguments("int", "string").WithLocation(39, 274),
+               // (39,274): error CS1662: Cannot convert lambda expression to intended delegate type because some of the return types in the block are not implicitly convertible to the delegate return type
                //             __builder.AddComponentParameter(3, nameof(global::Test.MyComponent.ValueExpression), global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Linq.Expressions.Expression<global::System.Func<global::System.String>>>(() => ParentValue));
-               Diagnostic(ErrorCode.ERR_CantConvAnonMethReturns, "ParentValue").WithArguments("lambda expression").WithLocation(47, 274)
+               Diagnostic(ErrorCode.ERR_CantConvAnonMethReturns, "ParentValue").WithArguments("lambda expression").WithLocation(39, 274)
             ]);
     }
 
@@ -10909,7 +10909,7 @@ public class Counter : ComponentBase
         // Assert
         CompileToAssembly(generated);
         Assert.DoesNotContain("<Counter", generated.Code);
-        Assert.Contains("global::MyComponents.", generated.Code);
+        Assert.Contains("global::MyComponents.Counter", generated.Code);
     }
 
     [IntegrationTestFact]
@@ -11811,9 +11811,9 @@ public class MyComponent : ComponentBase
             : [// x:\dir\subdir\Test\TestComponent.cshtml(1,32): error CS1003: Syntax error, ',' expected
               //                               x
               Diagnostic(ErrorCode.ERR_SyntaxError, "").WithArguments(",").WithLocation(1, 32),
-              // (37,88): error CS1501: No overload for method 'TypeCheck' takes 2 arguments
+              // (29,88): error CS1501: No overload for method 'TypeCheck' takes 2 arguments
               //             __o = global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.String>(
-              Diagnostic(ErrorCode.ERR_BadArgCount, "TypeCheck<global::System.String>").WithArguments("TypeCheck", "2").WithLocation(37, 88)]
+              Diagnostic(ErrorCode.ERR_BadArgCount, "TypeCheck<global::System.String>").WithArguments("TypeCheck", "2").WithLocation(29, 88)]
             );
         Assert.NotEmpty(generated.RazorDiagnostics);
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitBooleanConversion/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitBooleanConversion/TestComponent.codegen.cs
index 7d04368430e..243edfeb727 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitBooleanConversion/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitBooleanConversion/TestComponent.codegen.cs
@@ -54,15 +54,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::Test.MyClass<T> __arg0, int __seq1, global::System.Boolean __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddAttribute(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (1,14)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitBooleanConversion/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitBooleanConversion/TestComponent.mappings.txt
index 01dde230b05..fc326d08245 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitBooleanConversion/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitBooleanConversion/TestComponent.mappings.txt
@@ -17,18 +17,13 @@ Generated Location: (1189:40,0 [42] )
     private MyClass<string> c = new();
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1766:59,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyParameter|
-Generated Location: (2007:68,0 [11] )
+Generated Location: (1864:60,0 [11] )
 |MyParameter|
 
 Source Location: (29:0,29 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |BoolParameter|
-Generated Location: (2257:77,0 [13] )
+Generated Location: (2114:69,0 [13] )
 |BoolParameter|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_Bind/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_Bind/TestComponent.codegen.cs
index 8ec3c8c949e..afb7c37a782 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_Bind/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_Bind/TestComponent.codegen.cs
@@ -70,15 +70,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Boolean __arg0, int __seq1, global::System.String __arg1, int __seq2, global::System.Delegate __arg2, int __seq3, global::System.Object __arg3, int __seq4, global::Test.MyClass<T> __arg4, int __seq5, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyClass<T>> __arg5)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddAttribute(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (2,5)-(2,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_Bind/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_Bind/TestComponent.mappings.txt
index e5117c2d625..b2cf70f9ed8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_Bind/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_Bind/TestComponent.mappings.txt
@@ -27,33 +27,28 @@ Generated Location: (1731:56,0 [42] )
     private MyClass<string> c = new();
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2535:75,0 [11] )
-|MyComponent|
-
 Source Location: (40:1,4 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |BoolParameter|
-Generated Location: (2775:84,0 [13] )
+Generated Location: (2632:76,0 [13] )
 |BoolParameter|
 
 Source Location: (66:2,4 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |StringParameter|
-Generated Location: (3026:93,0 [15] )
+Generated Location: (2883:85,0 [15] )
 |StringParameter|
 
 Source Location: (93:3,4 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |DelegateParameter|
-Generated Location: (3279:102,0 [17] )
+Generated Location: (3136:94,0 [17] )
 |DelegateParameter|
 
 Source Location: (128:4,4 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |ObjectParameter|
-Generated Location: (3534:111,0 [15] )
+Generated Location: (3391:103,0 [15] )
 |ObjectParameter|
 
 Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyParameter|
-Generated Location: (3788:120,0 [11] )
+Generated Location: (3645:112,0 [11] )
 |MyParameter|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown/TestComponent.codegen.cs
index a6a73b20dc9..8e79f5ff9e1 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddAttribute(1, "Value", (object)(
 #nullable restore
 #line (1,27)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown/TestComponent.mappings.txt
index ec2f472cf8e..692b15c6aea 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |c|
-Generated Location: (1008:31,0 [1] )
+Generated Location: (861:23,0 [1] )
 |c|
 
 Source Location: (42:2,7 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private MyClass c = new();
 |
-Generated Location: (1448:43,0 [34] )
+Generated Location: (1301:35,0 [34] )
 |
     private MyClass c = new();
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown_Assignment/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown_Assignment/TestComponent.codegen.cs
index 8914aa1310c..9e7e82d5fbd 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown_Assignment/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown_Assignment/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddAttribute(1, "Value", (object)(
 #nullable restore
 #line (1,27)-(1,34) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown_Assignment/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown_Assignment/TestComponent.mappings.txt
index a0f5f1c0ce1..8506231b90d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown_Assignment/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_BindUnknown_Assignment/TestComponent.mappings.txt
@@ -1,11 +1,6 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |c1 = c2|
-Generated Location: (1008:31,0 [7] )
+Generated Location: (861:23,0 [7] )
 |c1 = c2|
 
 Source Location: (48:2,7 [68] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +8,7 @@ Source Location: (48:2,7 [68] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyClass c1 = new();
     private MyClass c2 = new();
 |
-Generated Location: (1466:43,0 [68] )
+Generated Location: (1319:35,0 [68] )
 |
     private MyClass c1 = new();
     private MyClass c2 = new();
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_CustomEvent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_CustomEvent/TestComponent.codegen.cs
index 62ab8698a92..f1e507ec56a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_CustomEvent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_CustomEvent/TestComponent.codegen.cs
@@ -78,15 +78,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::Test.MyClass<T> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1, int __seq2, global::System.Boolean __arg2, int __seq3, global::System.String __arg3, int __seq4, global::System.Delegate __arg4, int __seq5, global::System.Object __arg5)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddAttribute(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (1,14)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_CustomEvent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_CustomEvent/TestComponent.mappings.txt
index a68f81cf9bb..8c97113d5e1 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_CustomEvent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_CustomEvent/TestComponent.mappings.txt
@@ -32,38 +32,33 @@ Generated Location: (1757:64,0 [42] )
     private MyClass<string> c = new();
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2536:83,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyParameter|
-Generated Location: (2777:92,0 [11] )
+Generated Location: (2634:84,0 [11] )
 |MyParameter|
 
 Source Location: (34:1,4 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEvent|
-Generated Location: (3026:101,0 [7] )
+Generated Location: (2883:93,0 [7] )
 |MyEvent|
 
 Source Location: (59:2,4 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |BoolParameter|
-Generated Location: (3271:110,0 [13] )
+Generated Location: (3128:102,0 [13] )
 |BoolParameter|
 
 Source Location: (85:3,4 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |StringParameter|
-Generated Location: (3522:119,0 [15] )
+Generated Location: (3379:111,0 [15] )
 |StringParameter|
 
 Source Location: (112:4,4 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |DelegateParameter|
-Generated Location: (3775:128,0 [17] )
+Generated Location: (3632:120,0 [17] )
 |DelegateParameter|
 
 Source Location: (147:5,4 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |ObjectParameter|
-Generated Location: (4030:137,0 [15] )
+Generated Location: (3887:129,0 [15] )
 |ObjectParameter|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_TypeInference/TestComponent.codegen.cs
index bcc7a7dc744..ed7f51f3b98 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_TypeInference/TestComponent.codegen.cs
@@ -70,15 +70,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::Test.MyClass<T> __arg0, int __seq1, global::System.Boolean __arg1, int __seq2, global::System.String __arg2, int __seq3, global::System.Delegate __arg3, int __seq4, global::System.Object __arg4)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddAttribute(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (1,14)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_TypeInference/TestComponent.mappings.txt
index 1b308ab05d7..f3d9ba6e18b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddAttribute_ImplicitStringConversion_TypeInference/TestComponent.mappings.txt
@@ -27,33 +27,28 @@ Generated Location: (1518:56,0 [51] )
     private readonly MyClass<string> c = new();
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2232:75,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyParameter|
-Generated Location: (2473:84,0 [11] )
+Generated Location: (2330:76,0 [11] )
 |MyParameter|
 
 Source Location: (34:1,4 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |BoolParameter|
-Generated Location: (2722:93,0 [13] )
+Generated Location: (2579:85,0 [13] )
 |BoolParameter|
 
 Source Location: (60:2,4 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |StringParameter|
-Generated Location: (2973:102,0 [15] )
+Generated Location: (2830:94,0 [15] )
 |StringParameter|
 
 Source Location: (87:3,4 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |DelegateParameter|
-Generated Location: (3226:111,0 [17] )
+Generated Location: (3083:103,0 [17] )
 |DelegateParameter|
 
 Source Location: (122:4,4 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |ObjectParameter|
-Generated Location: (3481:120,0 [15] )
+Generated Location: (3338:112,0 [15] )
 |ObjectParameter|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_DynamicComponentName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_DynamicComponentName/TestComponent.codegen.cs
index 58ca44f8465..6e511a0601b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_DynamicComponentName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_DynamicComponentName/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,9) "x:\dir\subdir\Test\TestComponent.cshtml"
-dynamic
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.dynamic>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.dynamic.
 #nullable restore
 #line (1,10)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_DynamicComponentName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_DynamicComponentName/TestComponent.mappings.txt
index c4f189f93ec..c376d5fa3d5 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_DynamicComponentName/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_DynamicComponentName/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-|dynamic|
-Generated Location: (785:22,0 [7] )
-|dynamic|
-
-Source Location: (9:0,9 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (9:0,9 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1022:31,0 [5] )
+Generated Location: (876:23,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_EscapedComponentName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_EscapedComponentName/TestComponent.codegen.cs
index f19eb469e7a..32792a48ac9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_EscapedComponentName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_EscapedComponentName/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,5) 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-@int
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.@int>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.@int.
 #nullable restore
 #line (1,6)-(1,11) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_EscapedComponentName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_EscapedComponentName/TestComponent.mappings.txt
index de53e5a4af9..fc636663a76 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_EscapedComponentName/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_EscapedComponentName/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-|int|
-Generated Location: (788:22,1 [3] )
-|int|
-
-Source Location: (5:0,5 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (5:0,5 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1017:31,0 [5] )
+Generated Location: (869:23,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_GlobalNamespace/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_GlobalNamespace/TestComponent.codegen.cs
index 884ce02d740..3eec6001c86 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_GlobalNamespace/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_GlobalNamespace/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::MyComponent.
 #nullable restore
 #line (1,14)-(1,19) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_GlobalNamespace/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_GlobalNamespace/TestComponent.mappings.txt
index 1ea1941882e..64f9a0c51f9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_GlobalNamespace/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_GlobalNamespace/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (781:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1021:31,0 [5] )
+Generated Location: (874:23,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_WithNameof/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_WithNameof/TestComponent.codegen.cs
index ee14ba55f76..ddc5424c599 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_WithNameof/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_WithNameof/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,19) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_WithNameof/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_WithNameof/TestComponent.mappings.txt
index b4ba9a54a63..0e6b43d7c3a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_WithNameof/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/AddComponentParameter_WithNameof/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (38:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string nameof(string s) => string.Empty;
 |
-Generated Location: (1284:42,0 [55] )
+Generated Location: (1137:34,0 [55] )
 |
     public string nameof(string s) => string.Empty;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
index c9d3307f195..b46ee79b0fe 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 4c8c36eaed8..f02bfe1b54a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2337:52,0 [50] )
+Generated Location: (2190:44,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index 7bc737e36b4..c90d7acc6f0 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -46,15 +46,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (1,20)-(1,29) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index d460446608f..ac9f7fad38c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -12,13 +12,8 @@ Generated Location: (1300:32,0 [65] )
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1999:51,0 [11] )
-|MyComponent|
-
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |SomeParam|
-Generated Location: (2249:60,0 [9] )
+Generated Location: (2106:52,0 [9] )
 |SomeParam|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_NestedGeneric/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_NestedGeneric/TestComponent.codegen.cs
index 77ccb8d3bd4..1d68a8a1316 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_NestedGeneric/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_NestedGeneric/TestComponent.codegen.cs
@@ -46,15 +46,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.IEnumerable<T> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.IEnumerable<T>> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<global::System.Collections.Generic.IEnumerable<T>>> __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (1,20)-(1,29) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_NestedGeneric/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_NestedGeneric/TestComponent.mappings.txt
index 60a841b93b0..98be953f456 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_NestedGeneric/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValueAndExpression_NestedGeneric/TestComponent.mappings.txt
@@ -12,13 +12,8 @@ Generated Location: (1300:32,0 [89] )
     public IEnumerable<DateTime> ParentValue { get; set; } = new [] { DateTime.Now };
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2167:51,0 [11] )
-|MyComponent|
-
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |SomeParam|
-Generated Location: (2417:60,0 [9] )
+Generated Location: (2274:52,0 [9] )
 |SomeParam|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 69331100478..d241bc5e721 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index 164a69b3973..1fe81884eca 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2049:51,0 [50] )
+Generated Location: (1902:43,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index 2847d438091..3544a73b777 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 8186a2b732b..eb4a7854781 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_EventCallback_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (2049:51,0 [55] )
+Generated Location: (1902:43,0 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
index 54e2ed15535..ec6dd78b202 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
index abfb7ff4714..ea29ab07b34 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,28 +1,23 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (45:0,45 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1678:49,0 [5] )
+Generated Location: (1531:41,0 [5] )
 |Value|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1921:60,0 [50] )
+Generated Location: (1774:52,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
index 51bde7b4930..9f1b57b82ad 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "Value", 
 #nullable restore
 #line (1,27)-(1,38) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
index bb744b1e1fd..01992557ddf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndChangeEvent_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1008:31,0 [11] )
+Generated Location: (861:23,0 [11] )
 |ParentValue|
 
 Source Location: (80:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1473:43,0 [50] )
+Generated Location: (1326:35,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
index 0e88db83b16..2e70a69ed5b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
index 59092351bb3..e8d4440ec8e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2006:52,0 [50] )
+Generated Location: (1859:44,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
index d12b1cef983..6c68f3115f8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.codegen.cs
@@ -46,15 +46,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<T> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<T>> __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (1,20)-(1,29) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
index 594a6ad28cc..e2a1b1b1b27 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValueAndExpression_Generic/TestComponent.mappings.txt
@@ -12,13 +12,8 @@ Generated Location: (1104:32,0 [65] )
     public DateTime ParentValue { get; set; } = DateTime.Now;
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1771:51,0 [11] )
-|MyComponent|
-
 Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |SomeParam|
-Generated Location: (2021:60,0 [9] )
+Generated Location: (1878:52,0 [9] )
 |SomeParam|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
index 65e47920241..3f10ecd4ea1 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
index b413a4f6772..3a94fce9997 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1718:51,0 [50] )
+Generated Location: (1571:43,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_DynamicComponentName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_DynamicComponentName/TestComponent.codegen.cs
index 11fc4619857..bdf2d365142 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_DynamicComponentName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_DynamicComponentName/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,9) "x:\dir\subdir\Test\TestComponent.cshtml"
-dynamic
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.dynamic>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.dynamic.
 #nullable restore
 #line (1,16)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_DynamicComponentName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_DynamicComponentName/TestComponent.mappings.txt
index 53fb44bbabd..0d5fcc2cce4 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_DynamicComponentName/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_DynamicComponentName/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-|dynamic|
-Generated Location: (785:22,0 [7] )
-|dynamic|
-
-Source Location: (15:0,15 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (15:0,15 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1022:31,0 [5] )
+Generated Location: (876:23,0 [5] )
 |Value|
 
 Source Location: (22:0,22 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1282:39,0 [11] )
+Generated Location: (1136:31,0 [11] )
 |ParentValue|
 
 Source Location: (46:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1705:51,0 [50] )
+Generated Location: (1559:43,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_EscapedComponentName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_EscapedComponentName/TestComponent.codegen.cs
index 5ba4da46224..94bebec1e54 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_EscapedComponentName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_EscapedComponentName/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,5) 1 "x:\dir\subdir\Test\TestComponent.cshtml"
-@int
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.@int>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.@int.
 #nullable restore
 #line (1,12)-(1,17) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_EscapedComponentName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_EscapedComponentName/TestComponent.mappings.txt
index 86bdca0cb65..ff86df204f7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_EscapedComponentName/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_EscapedComponentName/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-|int|
-Generated Location: (788:22,1 [3] )
-|int|
-
-Source Location: (11:0,11 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (11:0,11 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1018:31,0 [5] )
+Generated Location: (870:23,0 [5] )
 |Value|
 
 Source Location: (18:0,18 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1278:39,0 [11] )
+Generated Location: (1130:31,0 [11] )
 |ParentValue|
 
 Source Location: (42:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1698:51,0 [50] )
+Generated Location: (1550:43,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_GlobalNamespaceComponent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_GlobalNamespaceComponent/TestComponent.codegen.cs
index c613dd599f0..aa9e2409461 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_GlobalNamespaceComponent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_GlobalNamespaceComponent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_GlobalNamespaceComponent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_GlobalNamespaceComponent/TestComponent.mappings.txt
index d8ca731a86a..b2dabfd1ac9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_GlobalNamespaceComponent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_GlobalNamespaceComponent/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (781:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1021:31,0 [5] )
+Generated Location: (874:23,0 [5] )
 |Value|
 
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1281:39,0 [11] )
+Generated Location: (1134:31,0 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1703:51,0 [50] )
+Generated Location: (1556:43,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_WithNameof/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_WithNameof/TestComponent.codegen.cs
index b3587e258ba..de4d84d6495 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_WithNameof/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_WithNameof/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_WithNameof/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_WithNameof/TestComponent.mappings.txt
index 76106f68dda..7daa1a95a55 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_WithNameof/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithMatchingProperties_WithNameof/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -19,7 +14,7 @@ Source Location: (50:1,7 [105] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public string nameof(string s) => string.Empty;
 |
-Generated Location: (1718:51,0 [105] )
+Generated Location: (1571:43,0 [105] )
 |
     public int ParentValue { get; set; } = 42;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
index 2cf388a1a26..40682ed4943 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "Value", 
 #nullable restore
 #line (1,27)-(1,38) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
index 1424a7fc961..3ad1ed4ccd8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_SpecifiesValue_WithoutMatchingProperties/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1008:31,0 [11] )
+Generated Location: (861:23,0 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (1476:43,0 [50] )
+Generated Location: (1329:35,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
index fd1055172d7..ceb8519409b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
index 899da6109c8..6391db2862a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_TypeChecked_WithMatchingProperties/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (26:0,26 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (50:1,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "42";
 |
-Generated Location: (1718:51,0 [55] )
+Generated Location: (1571:43,0 [55] )
 |
     public string ParentValue { get; set; } = "42";
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_Action/TestComponent.codegen.cs
index 24790e0ee67..1b07b53a23c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_Action/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_Action/TestComponent.mappings.txt
index 00bed3373e7..1ae651b179d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_Action/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (62:0,62 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Update|
-Generated Location: (1730:48,0 [6] )
+Generated Location: (1583:40,0 [6] )
 |Update|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1942:57,0 [5] )
+Generated Location: (1795:49,0 [5] )
 |Value|
 
 Source Location: (81:1,7 [82] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +24,7 @@ Source Location: (81:1,7 [82] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public void Update() { }
 |
-Generated Location: (2185:68,0 [82] )
+Generated Location: (2038:60,0 [82] )
 |
     public int ParentValue { get; set; } = 42;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_ActionLambda/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_ActionLambda/TestComponent.codegen.cs
index 351ee596efe..7eef98c6795 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_ActionLambda/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_ActionLambda/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_ActionLambda/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_ActionLambda/TestComponent.mappings.txt
index b1941b4fbc5..73db4055c37 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_ActionLambda/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_ActionLambda/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (62:0,62 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (1730:48,0 [9] )
+Generated Location: (1583:40,0 [9] )
 |() => { }|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1945:57,0 [5] )
+Generated Location: (1798:49,0 [5] )
 |Value|
 
 Source Location: (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2188:68,0 [50] )
+Generated Location: (2041:60,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_AsyncLambdaProducesError/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_AsyncLambdaProducesError/TestComponent.codegen.cs
index e862b4815fc..798e4f597cb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_AsyncLambdaProducesError/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_AsyncLambdaProducesError/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_AsyncLambdaProducesError/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_AsyncLambdaProducesError/TestComponent.mappings.txt
index 223d9c4292f..bc78a40eef2 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_AsyncLambdaProducesError/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_AsyncLambdaProducesError/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (60:0,60 [62] x:\dir\subdir\Test\TestComponent.cshtml)
 |(value => { ParentValue = value; return Task.CompletedTask; })|
-Generated Location: (1596:48,0 [62] )
+Generated Location: (1449:40,0 [62] )
 |(value => { ParentValue = value; return Task.CompletedTask; })|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1860:57,0 [5] )
+Generated Location: (1713:49,0 [5] )
 |Value|
 
 Source Location: (135:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2103:68,0 [50] )
+Generated Location: (1956:60,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback/TestComponent.codegen.cs
index 9808741a0d2..9279a9c2136 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback/TestComponent.mappings.txt
index 3e941b6d3cf..b7073694cb7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (62:0,62 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (2170:48,0 [11] )
+Generated Location: (2023:40,0 [11] )
 |UpdateValue|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2423:57,0 [5] )
+Generated Location: (2276:49,0 [5] )
 |Value|
 
 Source Location: (86:1,7 [102] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -28,7 +23,7 @@ Source Location: (86:1,7 [102] x:\dir\subdir\Test\TestComponent.cshtml)
     public int ParentValue { get; set; } = 42;
     public EventCallback UpdateValue { get; set; }
 |
-Generated Location: (2666:68,0 [102] )
+Generated Location: (2519:60,0 [102] )
 |
     public int ParentValue { get; set; } = 42;
     public EventCallback UpdateValue { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesAction/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesAction/TestComponent.codegen.cs
index f0816b0b402..a0237e0dc32 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesAction/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesAction/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesAction/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesAction/TestComponent.mappings.txt
index 72bb3556262..441550dee99 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesAction/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesAction/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (62:0,62 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (2170:48,0 [9] )
+Generated Location: (2023:40,0 [9] )
 |() => { }|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2421:57,0 [5] )
+Generated Location: (2274:49,0 [5] )
 |Value|
 
 Source Location: (84:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2664:68,0 [50] )
+Generated Location: (2517:60,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesFunction/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesFunction/TestComponent.codegen.cs
index ce66d27f3b0..3b1f2f3d1ac 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesFunction/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesFunction/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesFunction/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesFunction/TestComponent.mappings.txt
index 9517c3ae2a2..6d6b59173c9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesFunction/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_EventCallback_ReceivesFunction/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (62:0,62 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (2170:48,0 [11] )
+Generated Location: (2023:40,0 [11] )
 |UpdateValue|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2423:57,0 [5] )
+Generated Location: (2276:49,0 [5] )
 |Value|
 
 Source Location: (86:1,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +24,7 @@ Source Location: (86:1,7 [106] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public Task UpdateValue() => Task.CompletedTask;
 |
-Generated Location: (2666:68,0 [106] )
+Generated Location: (2519:60,0 [106] )
 |
     public int ParentValue { get; set; } = 42;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningDelegate/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningDelegate/TestComponent.codegen.cs
index db85bd71468..fa4909015ba 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningDelegate/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningDelegate/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningDelegate/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningDelegate/TestComponent.mappings.txt
index c927cc9cb36..6ad7c6c4259 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningDelegate/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningDelegate/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (62:0,62 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Update|
-Generated Location: (1778:48,0 [6] )
+Generated Location: (1631:40,0 [6] )
 |Update|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1990:57,0 [5] )
+Generated Location: (1843:49,0 [5] )
 |Value|
 
 Source Location: (81:1,7 [101] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +24,7 @@ Source Location: (81:1,7 [101] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public Task Update() => Task.CompletedTask;
 |
-Generated Location: (2233:68,0 [101] )
+Generated Location: (2086:60,0 [101] )
 |
     public int ParentValue { get; set; } = 42;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningLambda/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningLambda/TestComponent.codegen.cs
index d538095b8b6..2913a3488c6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningLambda/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningLambda/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningLambda/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningLambda/TestComponent.mappings.txt
index 07db2ba37df..59ca2eadbbe 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningLambda/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithAfter_TaskReturningLambda/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (62:0,62 [36] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { return Task.CompletedTask; }|
-Generated Location: (1778:48,0 [36] )
+Generated Location: (1631:40,0 [36] )
 |() => { return Task.CompletedTask; }|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2020:57,0 [5] )
+Generated Location: (1873:49,0 [5] )
 |Value|
 
 Source Location: (111:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2263:68,0 [50] )
+Generated Location: (2116:60,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_Action/TestComponent.codegen.cs
index 484ff94f1ca..dce6e9654fc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_Action/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_Action/TestComponent.mappings.txt
index 37e21218cd6..17dbb1926fe 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_Action/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (60:0,60 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (1595:48,0 [11] )
+Generated Location: (1448:40,0 [11] )
 |UpdateValue|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1808:57,0 [5] )
+Generated Location: (1661:49,0 [5] )
 |Value|
 
 Source Location: (84:1,7 [116] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +24,7 @@ Source Location: (84:1,7 [116] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public void UpdateValue(int value) => ParentValue = value;
 |
-Generated Location: (2051:68,0 [116] )
+Generated Location: (1904:60,0 [116] )
 |
     public int ParentValue { get; set; } = 42;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ActionLambda/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ActionLambda/TestComponent.codegen.cs
index 4b8db3a3925..b6ee82543aa 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ActionLambda/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ActionLambda/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ActionLambda/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ActionLambda/TestComponent.mappings.txt
index 303a7855e5f..4869616d0f8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ActionLambda/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ActionLambda/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (60:0,60 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |value => ParentValue = value|
-Generated Location: (1595:48,0 [28] )
+Generated Location: (1448:40,0 [28] )
 |value => ParentValue = value|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1825:57,0 [5] )
+Generated Location: (1678:49,0 [5] )
 |Value|
 
 Source Location: (101:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2068:68,0 [50] )
+Generated Location: (1921:60,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback/TestComponent.codegen.cs
index 7e4c8892119..e756390bc53 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback/TestComponent.mappings.txt
index c4408a7284c..b87605cb8ff 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (60:0,60 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (1911:48,0 [11] )
+Generated Location: (1764:40,0 [11] )
 |UpdateValue|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2139:57,0 [5] )
+Generated Location: (1992:49,0 [5] )
 |Value|
 
 Source Location: (84:1,7 [107] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -28,7 +23,7 @@ Source Location: (84:1,7 [107] x:\dir\subdir\Test\TestComponent.cshtml)
     public int ParentValue { get; set; } = 42;
     public EventCallback<int> UpdateValue { get; set; }
 |
-Generated Location: (2382:68,0 [107] )
+Generated Location: (2235:60,0 [107] )
 |
     public int ParentValue { get; set; } = 42;
     public EventCallback<int> UpdateValue { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesAction/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesAction/TestComponent.codegen.cs
index ace79d6230e..e44e2cf76e1 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesAction/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesAction/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesAction/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesAction/TestComponent.mappings.txt
index e18ed3df1ec..2be57a01987 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesAction/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesAction/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (60:0,60 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |value => ParentValue = value|
-Generated Location: (1911:48,0 [28] )
+Generated Location: (1764:40,0 [28] )
 |value => ParentValue = value|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2156:57,0 [5] )
+Generated Location: (2009:49,0 [5] )
 |Value|
 
 Source Location: (101:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2399:68,0 [50] )
+Generated Location: (2252:60,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesFunction/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesFunction/TestComponent.codegen.cs
index 60a8383c6f0..65e7e2d0deb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesFunction/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesFunction/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesFunction/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesFunction/TestComponent.mappings.txt
index d9293bdd777..5ceb247b2a0 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesFunction/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_EventCallback_ReceivesFunction/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (60:0,60 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (1911:48,0 [11] )
+Generated Location: (1764:40,0 [11] )
 |UpdateValue|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2139:57,0 [5] )
+Generated Location: (1992:49,0 [5] )
 |Value|
 
 Source Location: (84:1,7 [144] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +24,7 @@ Source Location: (84:1,7 [144] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public Task UpdateValue(int value) { ParentValue = value; return Task.CompletedTask; }
 |
-Generated Location: (2382:68,0 [144] )
+Generated Location: (2235:60,0 [144] )
 |
     public int ParentValue { get; set; } = 42;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ProducesErrorOnOlderLanguageVersions/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ProducesErrorOnOlderLanguageVersions/TestComponent.codegen.cs
index 17bca4697e1..7e87ec82e05 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ProducesErrorOnOlderLanguageVersions/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ProducesErrorOnOlderLanguageVersions/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddAttribute(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ProducesErrorOnOlderLanguageVersions/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ProducesErrorOnOlderLanguageVersions/TestComponent.mappings.txt
index 17a90129177..6744de090ab 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ProducesErrorOnOlderLanguageVersions/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_ProducesErrorOnOlderLanguageVersions/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1022:31,0 [5] )
+Generated Location: (875:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (60:0,60 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (1596:48,0 [11] )
+Generated Location: (1449:40,0 [11] )
 |UpdateValue|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1810:57,0 [5] )
+Generated Location: (1663:49,0 [5] )
 |Value|
 
 Source Location: (84:1,7 [116] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +24,7 @@ Source Location: (84:1,7 [116] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public void UpdateValue(int value) => ParentValue = value;
 |
-Generated Location: (2053:68,0 [116] )
+Generated Location: (1906:60,0 [116] )
 |
     public int ParentValue { get; set; } = 42;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningDelegate/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningDelegate/TestComponent.codegen.cs
index 738b679961a..cb493dc0b24 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningDelegate/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningDelegate/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningDelegate/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningDelegate/TestComponent.mappings.txt
index 8c6fc1425dd..f993cc40585 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningDelegate/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningDelegate/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (60:0,60 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (1630:48,0 [11] )
+Generated Location: (1483:40,0 [11] )
 |UpdateValue|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1843:57,0 [5] )
+Generated Location: (1696:49,0 [5] )
 |Value|
 
 Source Location: (84:1,7 [144] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -29,7 +24,7 @@ Source Location: (84:1,7 [144] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public Task UpdateValue(int value) { ParentValue = value; return Task.CompletedTask; }
 |
-Generated Location: (2086:68,0 [144] )
+Generated Location: (1939:60,0 [144] )
 |
     public int ParentValue { get; set; } = 42;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningLambda/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningLambda/TestComponent.codegen.cs
index f8e9216a13d..a9cb063702c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningLambda/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningLambda/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningLambda/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningLambda/TestComponent.mappings.txt
index a9e0bcf5bdf..6ba6adcfabf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningLambda/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithGetSet_TaskReturningLambda/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1031:31,0 [5] )
+Generated Location: (884:23,0 [5] )
 |Value|
 
 Source Location: (30:0,30 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1291:39,0 [11] )
+Generated Location: (1144:31,0 [11] )
 |ParentValue|
 
 Source Location: (60:0,60 [60] x:\dir\subdir\Test\TestComponent.cshtml)
 |value => { ParentValue = value; return Task.CompletedTask; }|
-Generated Location: (1631:48,0 [60] )
+Generated Location: (1484:40,0 [60] )
 |value => { ParentValue = value; return Task.CompletedTask; }|
 
 Source Location: (49:0,49 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1893:57,0 [5] )
+Generated Location: (1746:49,0 [5] )
 |Value|
 
 Source Location: (133:1,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public int ParentValue { get; set; } = 42;
 |
-Generated Location: (2136:68,0 [50] )
+Generated Location: (1989:60,0 [50] )
 |
     public int ParentValue { get; set; } = 42;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
index 1000a4c26a5..9d8396d5234 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,11) "x:\dir\subdir\Test\TestComponent.cshtml"
-InputText
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.InputText>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.InputText.
 #nullable restore
 #line (1,18)-(1,23) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
index 11f2e592d68..24815817773 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToComponent_WithStringAttribute_DoesNotUseStringSyntax/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-|InputText|
-Generated Location: (786:22,0 [9] )
-|InputText|
-
-Source Location: (17:0,17 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (17:0,17 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1027:31,0 [5] )
+Generated Location: (880:23,0 [5] )
 |Value|
 
 Source Location: (24:0,24 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1288:39,0 [11] )
+Generated Location: (1141:31,0 [11] )
 |person.Name|
 
 Source Location: (56:3,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     Person person = new Person();
 |
-Generated Location: (1714:51,0 [37] )
+Generated Location: (1567:43,0 [37] )
 |
     Person person = new Person();
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.codegen.cs
index 9c122eaf42f..4d080a4798e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,22)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
 int
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.mappings.txt
index b391e1b7639..1eff1864ea2 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.mappings.txt
@@ -1,31 +1,26 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (946:30,0 [3] )
+Generated Location: (799:22,0 [3] )
 |int|
 
 Source Location: (32:0,32 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1189:39,0 [5] )
+Generated Location: (1042:31,0 [5] )
 |Value|
 
 Source Location: (43:0,43 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1432:47,0 [11] )
+Generated Location: (1285:39,0 [11] )
 |ParentValue|
 
 Source Location: (75:0,75 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Update|
-Generated Location: (1859:56,0 [6] )
+Generated Location: (1712:48,0 [6] )
 |Update|
 
 Source Location: (62:0,62 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2076:65,0 [5] )
+Generated Location: (1929:57,0 [5] )
 |Value|
 
 Source Location: (94:1,7 [82] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -34,7 +29,7 @@ Source Location: (94:1,7 [82] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public void Update() { }
 |
-Generated Location: (2319:76,0 [82] )
+Generated Location: (2172:68,0 [82] )
 |
     public int ParentValue { get; set; } = 42;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.codegen.cs
index 5946841f4e5..eece460573f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,22)-(1,33) "x:\dir\subdir\Test\TestComponent.cshtml"
 CustomValue
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.mappings.txt
index 4bdae664066..9f1a445d76d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.mappings.txt
@@ -1,31 +1,26 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CustomValue|
-Generated Location: (946:30,0 [11] )
+Generated Location: (799:22,0 [11] )
 |CustomValue|
 
 Source Location: (40:0,40 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1205:39,0 [5] )
+Generated Location: (1058:31,0 [5] )
 |Value|
 
 Source Location: (51:0,51 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1456:47,0 [11] )
+Generated Location: (1309:39,0 [11] )
 |ParentValue|
 
 Source Location: (81:0,81 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (2071:56,0 [11] )
+Generated Location: (1924:48,0 [11] )
 |UpdateValue|
 
 Source Location: (70:0,70 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2312:65,0 [5] )
+Generated Location: (2165:57,0 [5] )
 |Value|
 
 Source Location: (105:1,7 [147] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -34,7 +29,7 @@ Source Location: (105:1,7 [147] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public void UpdateValue(CustomValue value) => ParentValue = value;
 |
-Generated Location: (2555:76,0 [147] )
+Generated Location: (2408:68,0 [147] )
 |
     public CustomValue ParentValue { get; set; } = new CustomValue();
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.codegen.cs
index a487afd0987..9870896d009 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,22)-(1,33) "x:\dir\subdir\Test\TestComponent.cshtml"
 CustomValue
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.mappings.txt
index 8660f51c626..517e8be91eb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.mappings.txt
@@ -1,31 +1,26 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CustomValue|
-Generated Location: (946:30,0 [11] )
+Generated Location: (799:22,0 [11] )
 |CustomValue|
 
 Source Location: (40:0,40 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1205:39,0 [5] )
+Generated Location: (1058:31,0 [5] )
 |Value|
 
 Source Location: (51:0,51 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1456:47,0 [11] )
+Generated Location: (1309:39,0 [11] )
 |ParentValue|
 
 Source Location: (81:0,81 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (2071:56,0 [11] )
+Generated Location: (1924:48,0 [11] )
 |UpdateValue|
 
 Source Location: (70:0,70 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2312:65,0 [5] )
+Generated Location: (2165:57,0 [5] )
 |Value|
 
 Source Location: (105:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -33,7 +28,7 @@ Source Location: (105:1,7 [138] x:\dir\subdir\Test\TestComponent.cshtml)
     public CustomValue ParentValue { get; set; } = new CustomValue();
     public EventCallback<CustomValue> UpdateValue { get; set; }
 |
-Generated Location: (2555:76,0 [138] )
+Generated Location: (2408:68,0 [138] )
 |
     public CustomValue ParentValue { get; set; } = new CustomValue();
     public EventCallback<CustomValue> UpdateValue { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.codegen.cs
index eceb4b06211..c9f5d471360 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,22)-(1,33) "x:\dir\subdir\Test\TestComponent.cshtml"
 CustomValue
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.mappings.txt
index 3ee8c74a774..9a1f381e4f7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.mappings.txt
@@ -1,31 +1,26 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |CustomValue|
-Generated Location: (946:30,0 [11] )
+Generated Location: (799:22,0 [11] )
 |CustomValue|
 
 Source Location: (40:0,40 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1205:39,0 [5] )
+Generated Location: (1058:31,0 [5] )
 |Value|
 
 Source Location: (51:0,51 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1456:47,0 [11] )
+Generated Location: (1309:39,0 [11] )
 |ParentValue|
 
 Source Location: (81:0,81 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (2071:56,0 [11] )
+Generated Location: (1924:48,0 [11] )
 |UpdateValue|
 
 Source Location: (70:0,70 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2312:65,0 [5] )
+Generated Location: (2165:57,0 [5] )
 |Value|
 
 Source Location: (105:1,7 [179] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -34,7 +29,7 @@ Source Location: (105:1,7 [179] x:\dir\subdir\Test\TestComponent.cshtml)
 
         public Task UpdateValue(CustomValue value) { ParentValue = value; return Task.CompletedTask; }
 |
-Generated Location: (2555:76,0 [179] )
+Generated Location: (2408:68,0 [179] )
 |
     public CustomValue ParentValue { get; set; } = new CustomValue();
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithAfter_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithAfter_Action/TestComponent.codegen.cs
index b17864243cd..51819242001 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithAfter_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithAfter_Action/TestComponent.codegen.cs
@@ -56,15 +56,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0, int __seq1, global::System.Action<TValue> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TValue>.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithAfter_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithAfter_Action/TestComponent.mappings.txt
index 2174974b15a..8958c2be569 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithAfter_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithAfter_Action/TestComponent.mappings.txt
@@ -21,13 +21,8 @@ Generated Location: (1343:40,0 [82] )
     public void Update() { }
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1955:61,0 [11] )
-|MyComponent|
-
 Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2215:70,0 [5] )
+Generated Location: (2072:62,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.codegen.cs
index 42a8e0aa616..8dff4a138c7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.codegen.cs
@@ -56,15 +56,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TValue> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TValue>.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.mappings.txt
index e9ca9d1d952..b68e8e7fd34 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.mappings.txt
@@ -21,13 +21,8 @@ Generated Location: (1405:40,0 [147] )
     public void UpdateValue(CustomValue value) => ParentValue = value;
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2114:61,0 [11] )
-|MyComponent|
-
 Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2374:70,0 [5] )
+Generated Location: (2231:62,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.codegen.cs
index b13a0c87321..fcd7e5615cf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.codegen.cs
@@ -55,15 +55,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TValue> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TValue>.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.mappings.txt
index 4943f4ac0e1..df7365e58d2 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.mappings.txt
@@ -19,13 +19,8 @@ Generated Location: (1405:40,0 [138] )
     public EventCallback<CustomValue> UpdateValue { get; set; }
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2105:60,0 [11] )
-|MyComponent|
-
 Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2365:69,0 [5] )
+Generated Location: (2222:61,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.codegen.cs
index 4e213ed1eeb..933a7f320d2 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.codegen.cs
@@ -56,15 +56,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TValue> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TValue>.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.mappings.txt
index 3746e6e0522..598bda4ebc5 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.mappings.txt
@@ -21,13 +21,8 @@ Generated Location: (1405:40,0 [175] )
     public Task UpdateValue(CustomValue value) { ParentValue = value; return Task.CompletedTask; }
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2142:61,0 [11] )
-|MyComponent|
-
 Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2402:70,0 [5] )
+Generated Location: (2259:62,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
index 9f219b8cbca..e7f685fd912 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.codegen.cs
@@ -45,15 +45,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(2);
+            __builder.OpenComponent<global::Test.MyComponent>(2);
             __builder.AddComponentParameter(3, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,14)-(2,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
index 153751effa8..85e1a1854d8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndAttributeChildContent/TestComponent.mappings.txt
@@ -13,18 +13,13 @@ Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1266:41,0 [2] )
 |; |
 
-Source Location: (93:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1454:50,0 [11] )
-|MyComponent|
-
 Source Location: (105:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Header|
-Generated Location: (1699:59,0 [6] )
+Generated Location: (1552:51,0 [6] )
 |Header|
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1936:67,0 [6] )
+Generated Location: (1789:59,0 [6] )
 |header|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
index 51e6d365c1e..01f2e818756 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.codegen.cs
@@ -45,15 +45,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(2);
+            __builder.OpenComponent<global::Test.MyComponent>(2);
             __builder.AddComponentParameter(3, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,14)-(2,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
index 153751effa8..85e1a1854d8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BodyAndExplicitChildContent/TestComponent.mappings.txt
@@ -13,18 +13,13 @@ Source Location: (87:0,87 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1266:41,0 [2] )
 |; |
 
-Source Location: (93:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1454:50,0 [11] )
-|MyComponent|
-
 Source Location: (105:1,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Header|
-Generated Location: (1699:59,0 [6] )
+Generated Location: (1552:51,0 [6] )
 |Header|
 
 Source Location: (113:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |header|
-Generated Location: (1936:67,0 [6] )
+Generated Location: (1789:59,0 [6] )
 |header|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CaptureParametersConstraint/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CaptureParametersConstraint/TestComponent.codegen.cs
index ea76e244050..c2eb3028ef2 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CaptureParametersConstraint/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CaptureParametersConstraint/TestComponent.codegen.cs
@@ -42,15 +42,7 @@ internal static class TypeInference
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::Test.MyClass<T> __arg0)
             where T : global::Test.IMyInterface
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (1,14)-(1,19) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CaptureParametersConstraint/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CaptureParametersConstraint/TestComponent.mappings.txt
index ba6fc7bc57e..796a76d02e2 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CaptureParametersConstraint/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CaptureParametersConstraint/TestComponent.mappings.txt
@@ -3,13 +3,8 @@
 Generated Location: (857:23,0 [27] )
 |new MyClass<IMyInterface>()|
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1736:47,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Param|
-Generated Location: (1986:56,0 [5] )
+Generated Location: (1843:48,0 [5] )
 |Param|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_CombiningMultipleAncestors/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_CombiningMultipleAncestors/TestComponent.codegen.cs
index 658d55de033..00c150b61ee 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_CombiningMultipleAncestors/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_CombiningMultipleAncestors/TestComponent.codegen.cs
@@ -59,15 +59,7 @@ internal static class TypeInference
     {
         public static void CreateParentOne_0<TOne>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TOne __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,11) "x:\dir\subdir\Test\TestComponent.cshtml"
-ParentOne
-
-#line default
-#line hidden
-#nullable disable
-        <TOne>>(seq);
+        __builder.OpenComponent<global::Test.ParentOne<TOne>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.ParentOne<TOne>.
 #nullable restore
 #line (1,12)-(1,17) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -87,15 +79,7 @@ public static void CreateParentOne_0_CaptureParameters<TOne>(TOne __arg0, out TO
         }
         public static void CreateParentTwo_1<TTwo>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TTwo __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-ParentTwo
-
-#line default
-#line hidden
-#nullable disable
-        <TTwo>>(seq);
+        __builder.OpenComponent<global::Test.ParentTwo<TTwo>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.ParentTwo<TTwo>.
 #nullable restore
 #line (2,16)-(2,21) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -115,15 +99,7 @@ public static void CreateParentTwo_1_CaptureParameters<TTwo>(TTwo __arg0, out TT
         }
         public static void CreateChild_2<TOne, TTwo>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TOne __syntheticArg0, TTwo __syntheticArg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,10)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-Child
-
-#line default
-#line hidden
-#nullable disable
-        <TOne, TTwo>>(seq);
+        __builder.OpenComponent<global::Test.Child<TOne, TTwo>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_CombiningMultipleAncestors/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_CombiningMultipleAncestors/TestComponent.mappings.txt
index ec381cbc53f..2f6201059bb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_CombiningMultipleAncestors/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_CombiningMultipleAncestors/TestComponent.mappings.txt
@@ -8,28 +8,13 @@ Source Location: (59:1,24 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1345:34,0 [7] )
 |"Hello"|
 
-Source Location: (1:0,1 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-|ParentOne|
-Generated Location: (2595:64,0 [9] )
-|ParentOne|
-
 Source Location: (11:0,11 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2847:73,0 [5] )
+Generated Location: (2704:65,0 [5] )
 |Value|
 
-Source Location: (40:1,5 [9] x:\dir\subdir\Test\TestComponent.cshtml)
-|ParentTwo|
-Generated Location: (3588:92,0 [9] )
-|ParentTwo|
-
 Source Location: (50:1,15 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (3840:101,0 [5] )
+Generated Location: (3554:85,0 [5] )
 |Value|
 
-Source Location: (80:2,9 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-|Child|
-Generated Location: (4528:120,0 [5] )
-|Child|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Explicit/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Explicit/TestComponent.codegen.cs
index 06bb032bdd1..88a77e44d46 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Explicit/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Explicit/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.Grid<
 #nullable restore
 #line (1,14)-(1,22) "x:\dir\subdir\Test\TestComponent.cshtml"
 DateTime
@@ -68,28 +60,12 @@ internal static class TypeInference
     {
         public static void CreateColumn_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TItem __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,60)-(1,66) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.CloseComponent();
         }
         public static void CreateColumn_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TItem __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,70)-(1,76) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Explicit/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Explicit/TestComponent.mappings.txt
index ec51e3f4695..d19c84ee2e3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Explicit/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Explicit/TestComponent.mappings.txt
@@ -1,30 +1,15 @@
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (785:22,0 [4] )
-|Grid|
-
-Source Location: (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |DateTime|
-Generated Location: (938:30,0 [8] )
+Generated Location: (792:22,0 [8] )
 |DateTime|
 
 Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (1184:39,0 [5] )
+Generated Location: (1038:31,0 [5] )
 |Items|
 
 Source Location: (32:0,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |Array.Empty<DateTime>()|
-Generated Location: (1480:47,0 [23] )
+Generated Location: (1334:39,0 [23] )
 |Array.Empty<DateTime>()|
 
-Source Location: (59:0,59 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (2479:73,0 [6] )
-|Column|
-
-Source Location: (69:0,69 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (2910:86,0 [6] )
-|Column|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ExplicitOverride/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ExplicitOverride/TestComponent.codegen.cs
index 2d1f88932d0..851c9e662e8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ExplicitOverride/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ExplicitOverride/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.Grid<
 #nullable restore
 #line (1,14)-(1,22) "x:\dir\subdir\Test\TestComponent.cshtml"
 DateTime
@@ -52,15 +44,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #nullable disable
             ));
             __builder.AddAttribute(2, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
-                __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (1,60)-(1,66) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-                <
+                __builder2.OpenComponent<global::Test.Column<
 #nullable restore
 #line (1,74)-(1,93) "x:\dir\subdir\Test\TestComponent.cshtml"
 System.TimeZoneInfo
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ExplicitOverride/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ExplicitOverride/TestComponent.mappings.txt
index 1c8518556a1..b24a640801a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ExplicitOverride/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ExplicitOverride/TestComponent.mappings.txt
@@ -1,30 +1,20 @@
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (785:22,0 [4] )
-|Grid|
-
-Source Location: (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |DateTime|
-Generated Location: (938:30,0 [8] )
+Generated Location: (792:22,0 [8] )
 |DateTime|
 
 Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (1184:39,0 [5] )
+Generated Location: (1038:31,0 [5] )
 |Items|
 
 Source Location: (32:0,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |Array.Empty<DateTime>()|
-Generated Location: (1480:47,0 [23] )
+Generated Location: (1334:39,0 [23] )
 |Array.Empty<DateTime>()|
 
-Source Location: (59:0,59 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (1840:57,0 [6] )
-|Column|
-
 Source Location: (73:0,73 [19] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.TimeZoneInfo|
-Generated Location: (1999:65,0 [19] )
+Generated Location: (1701:49,0 [19] )
 |System.TimeZoneInfo|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested/TestComponent.codegen.cs
index 63452222a11..a17522443d6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested/TestComponent.codegen.cs
@@ -44,15 +44,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Func<global::System.Collections.Generic.List<T>> __arg0, int __seq1, Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.Grid<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<T>.
 #nullable restore
 #line (1,7)-(1,11) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -72,15 +64,7 @@ public static void CreateGrid_0_CaptureParameters<T>(global::System.Func<global:
         }
         public static void CreateGridColumn_1<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Func<global::System.Collections.Generic.List<T>> __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-GridColumn
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.GridColumn<T>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested/TestComponent.mappings.txt
index 40769b59d64..fb2c73260a9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested/TestComponent.mappings.txt
@@ -3,18 +3,8 @@
 Generated Location: (850:23,0 [24] )
 |() => new List<string>()|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (1963:49,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Data|
-Generated Location: (2198:58,0 [4] )
+Generated Location: (2056:50,0 [4] )
 |Data|
 
-Source Location: (48:1,5 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|GridColumn|
-Generated Location: (3027:77,0 [10] )
-|GridColumn|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary/TestComponent.codegen.cs
index d474b5a373d..232dfc10220 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary/TestComponent.codegen.cs
@@ -44,15 +44,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Func<global::System.Collections.Generic.Dictionary<global::X, T>> __arg0, int __seq1, Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.Grid<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<T>.
 #nullable restore
 #line (1,7)-(1,11) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -72,15 +64,7 @@ public static void CreateGrid_0_CaptureParameters<T>(global::System.Func<global:
         }
         public static void CreateGridColumn_1<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Func<global::System.Collections.Generic.Dictionary<global::X, T>> __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-GridColumn
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.GridColumn<T>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary/TestComponent.mappings.txt
index e019a4e25c9..610bc45b6fd 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary/TestComponent.mappings.txt
@@ -3,18 +3,8 @@
 Generated Location: (850:23,0 [33] )
 |() => new Dictionary<X, string>()|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (1989:49,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Data|
-Generated Location: (2224:58,0 [4] )
+Generated Location: (2082:50,0 [4] )
 |Data|
 
-Source Location: (57:1,5 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|GridColumn|
-Generated Location: (3104:77,0 [10] )
-|GridColumn|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_02/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_02/TestComponent.codegen.cs
index 79218c4dcda..ff6c0195ccb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_02/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_02/TestComponent.codegen.cs
@@ -44,15 +44,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Func<global::System.Collections.Generic.Dictionary<global::Test.X, T>> __arg0, int __seq1, Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.Grid<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<T>.
 #nullable restore
 #line (1,7)-(1,11) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -72,15 +64,7 @@ public static void CreateGrid_0_CaptureParameters<T>(global::System.Func<global:
         }
         public static void CreateGridColumn_1<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Func<global::System.Collections.Generic.Dictionary<global::Test.X, T>> __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-GridColumn
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.GridColumn<T>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_02/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_02/TestComponent.mappings.txt
index f19fbebc983..3059d1b3ceb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_02/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_02/TestComponent.mappings.txt
@@ -3,18 +3,8 @@
 Generated Location: (850:23,0 [33] )
 |() => new Dictionary<X, string>()|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (1994:49,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Data|
-Generated Location: (2229:58,0 [4] )
+Generated Location: (2087:50,0 [4] )
 |Data|
 
-Source Location: (57:1,5 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|GridColumn|
-Generated Location: (3124:77,0 [10] )
-|GridColumn|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_03/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_03/TestComponent.codegen.cs
index 7ad0c02d81f..9dc2ccb960c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_03/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_03/TestComponent.codegen.cs
@@ -44,15 +44,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.Dictionary<global::X, T> __arg0, int __seq1, Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.Grid<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<T>.
 #nullable restore
 #line (1,7)-(1,11) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -72,15 +64,7 @@ public static void CreateGrid_0_CaptureParameters<T>(global::System.Collections.
         }
         public static void CreateGridColumn_1<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Collections.Generic.Dictionary<global::X, T> __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-GridColumn
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.GridColumn<T>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_03/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_03/TestComponent.mappings.txt
index 48cd547627c..d7d695c3c25 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_03/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_03/TestComponent.mappings.txt
@@ -3,18 +3,8 @@
 Generated Location: (850:23,0 [27] )
 |new Dictionary<X, string>()|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (1962:49,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Data|
-Generated Location: (2197:58,0 [4] )
+Generated Location: (2055:50,0 [4] )
 |Data|
 
-Source Location: (51:1,5 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|GridColumn|
-Generated Location: (3014:77,0 [10] )
-|GridColumn|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_Dynamic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_Dynamic/TestComponent.codegen.cs
index bbe0682c2a3..748ef5de42d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_Dynamic/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_Dynamic/TestComponent.codegen.cs
@@ -44,15 +44,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.Dictionary<dynamic, T> __arg0, int __seq1, Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.Grid<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<T>.
 #nullable restore
 #line (1,7)-(1,11) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -72,15 +64,7 @@ public static void CreateGrid_0_CaptureParameters<T>(global::System.Collections.
         }
         public static void CreateGridColumn_1<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Collections.Generic.Dictionary<dynamic, T> __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-GridColumn
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.GridColumn<T>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_Dynamic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_Dynamic/TestComponent.mappings.txt
index f4e8d01d625..843b5a3441d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_Dynamic/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericArgumentNested_Dictionary_Dynamic/TestComponent.mappings.txt
@@ -3,18 +3,8 @@
 Generated Location: (850:23,0 [33] )
 |new Dictionary<dynamic, string>()|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (1966:49,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Data|
-Generated Location: (2201:58,0 [4] )
+Generated Location: (2059:50,0 [4] )
 |Data|
 
-Source Location: (57:1,5 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|GridColumn|
-Generated Location: (3012:77,0 [10] )
-|GridColumn|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericChildContent/TestComponent.codegen.cs
index 20b77fd502b..fa1a71c355c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericChildContent/TestComponent.codegen.cs
@@ -54,15 +54,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.IEnumerable<TItem> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Grid<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<TItem>.
 #nullable restore
 #line (1,7)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -82,15 +74,7 @@ public static void CreateGrid_0_CaptureParameters<TItem>(global::System.Collecti
         }
         public static void CreateColumn_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Collections.Generic.IEnumerable<TItem> __syntheticArg0, int __seq0, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,43)-(1,49) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, "ChildContent", __arg0);
         __builder.CloseComponent();
         }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericChildContent/TestComponent.mappings.txt
index 439c58ff870..a5c61c26647 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericChildContent/TestComponent.mappings.txt
@@ -8,18 +8,8 @@ Source Location: (50:0,50 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1403:33,25 [12] )
 |context.Year|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (2242:59,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (2485:68,0 [5] )
+Generated Location: (2343:60,0 [5] )
 |Items|
 
-Source Location: (42:0,42 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (3372:87,0 [6] )
-|Column|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericLambda/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericLambda/TestComponent.codegen.cs
index e126cad6fd2..41f894b4a47 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericLambda/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericLambda/TestComponent.codegen.cs
@@ -52,15 +52,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.IEnumerable<TItem> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Grid<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<TItem>.
 #nullable restore
 #line (1,7)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -80,15 +72,7 @@ public static void CreateGrid_0_CaptureParameters<TItem>(global::System.Collecti
         }
         public static void CreateColumn_1<TItem, TOutput>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Collections.Generic.IEnumerable<TItem> __syntheticArg0, int __seq0, global::System.Func<TItem, TOutput> __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,43)-(1,49) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem, TOutput>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem, TOutput>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Column<TItem, TOutput>.
 #nullable restore
 #line (1,50)-(1,60) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericLambda/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericLambda/TestComponent.mappings.txt
index 96db2db0263..5c8e99104a8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericLambda/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_GenericLambda/TestComponent.mappings.txt
@@ -8,23 +8,13 @@ Source Location: (63:0,63 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1345:33,0 [11] )
 |x => x.Year|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (2132:57,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (2375:66,0 [5] )
+Generated Location: (2233:58,0 [5] )
 |Items|
 
-Source Location: (42:0,42 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (3245:85,0 [6] )
-|Column|
-
 Source Location: (49:0,49 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |SomeLambda|
-Generated Location: (3511:94,0 [10] )
+Generated Location: (3225:78,0 [10] )
 |SomeLambda|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints/TestComponent.codegen.cs
index e559ab13d1a..82d10d76313 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.Grid<
 #nullable restore
 #line (1,14)-(1,29) "x:\dir\subdir\Test\TestComponent.cshtml"
 WeatherForecast
@@ -60,15 +52,7 @@ internal static class TypeInference
         public static void CreateColumn_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TItem __syntheticArg0, int __seq0, global::System.Object __arg0, int __seq1, global::System.String __arg1, int __seq2, global::System.Object __arg2, int __seq3, global::System.Object __arg3)
             where TItem : class, new()
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,10)-(3,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, "Title", __arg0);
         __builder.AddComponentParameter(__seq1, nameof(global::Test.Column<TItem>.
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints/TestComponent.mappings.txt
index 0159c889658..55aade47d69 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints/TestComponent.mappings.txt
@@ -1,25 +1,15 @@
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (785:22,0 [4] )
-|Grid|
-
-Source Location: (13:0,13 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |WeatherForecast|
-Generated Location: (938:30,0 [15] )
+Generated Location: (792:22,0 [15] )
 |WeatherForecast|
 
 Source Location: (39:0,39 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |Array.Empty<WeatherForecast>()|
-Generated Location: (1165:39,0 [30] )
+Generated Location: (1019:31,0 [30] )
 |Array.Empty<WeatherForecast>()|
 
-Source Location: (106:2,9 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (2312:65,0 [6] )
-|Column|
-
 Source Location: (126:2,29 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |FieldName|
-Generated Location: (2627:75,0 [9] )
+Generated Location: (2337:59,0 [9] )
 |FieldName|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.codegen.cs
index d5731159102..5b2551f3766 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.codegen.cs
@@ -22,15 +22,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.Grid<
 #nullable restore
 #line (3,14)-(3,29) "x:\dir\subdir\Test\TestComponent.cshtml"
 WeatherForecast
@@ -65,15 +57,7 @@ internal static class TypeInference
         public static void CreateColumn_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TItem __syntheticArg0, int __seq0, global::System.Object __arg0, int __seq1, global::System.String __arg1, int __seq2, global::System.Object __arg2, int __seq3, global::System.Object __arg3)
             where TItem : global::Models.WeatherForecast, new()
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (5,10)-(5,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, "Title", __arg0);
         __builder.AddComponentParameter(__seq1, nameof(global::Test.Column<TItem>.
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.mappings.txt
index 6ae31051409..7c0ad4cc7f7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_ClassesAndInterfaces/TestComponent.mappings.txt
@@ -3,28 +3,18 @@
 Generated Location: (372:12,0 [13] )
 |using Models;|
 
-Source Location: (19:2,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (902:27,0 [4] )
-|Grid|
-
 Source Location: (31:2,13 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |WeatherForecast|
-Generated Location: (1055:35,0 [15] )
+Generated Location: (909:27,0 [15] )
 |WeatherForecast|
 
 Source Location: (57:2,39 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |Array.Empty<WeatherForecast>()|
-Generated Location: (1282:44,0 [30] )
+Generated Location: (1136:36,0 [30] )
 |Array.Empty<WeatherForecast>()|
 
-Source Location: (124:4,9 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (2454:70,0 [6] )
-|Column|
-
 Source Location: (144:4,29 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |FieldName|
-Generated Location: (2769:80,0 [9] )
+Generated Location: (2479:64,0 [9] )
 |FieldName|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.codegen.cs
index dd6a3d332ed..c97e682feb9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.codegen.cs
@@ -22,15 +22,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.Grid<
 #nullable restore
 #line (2,14)-(2,29) "x:\dir\subdir\Test\TestComponent.cshtml"
 WeatherForecast
@@ -65,15 +57,7 @@ internal static class TypeInference
         public static void CreateColumn_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TItem __syntheticArg0, int __seq0, global::System.Object __arg0, int __seq1, global::System.String __arg1, int __seq2, global::System.Object __arg2, int __seq3, global::System.Object __arg3)
             where TItem : global::System.Collections.Generic.IEnumerable<TItem>
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (4,10)-(4,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, "Title", __arg0);
         __builder.AddComponentParameter(__seq1, nameof(global::Test.Column<TItem>.
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.mappings.txt
index c5d2a156bb1..f64f98645ff 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_MultipleConstraints_GenericClassConstraints/TestComponent.mappings.txt
@@ -3,28 +3,18 @@
 Generated Location: (372:12,0 [13] )
 |using Models;|
 
-Source Location: (17:1,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (902:27,0 [4] )
-|Grid|
-
 Source Location: (29:1,13 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |WeatherForecast|
-Generated Location: (1055:35,0 [15] )
+Generated Location: (909:27,0 [15] )
 |WeatherForecast|
 
 Source Location: (55:1,39 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |Array.Empty<WeatherForecast>()|
-Generated Location: (1282:44,0 [30] )
+Generated Location: (1136:36,0 [30] )
 |Array.Empty<WeatherForecast>()|
 
-Source Location: (122:3,9 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (2470:70,0 [6] )
-|Column|
-
 Source Location: (142:3,29 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |FieldName|
-Generated Location: (2785:80,0 [9] )
+Generated Location: (2495:64,0 [9] )
 |FieldName|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_WithConstraints/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_WithConstraints/TestComponent.codegen.cs
index ce96bb7110a..6c49e55ab6e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_WithConstraints/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_WithConstraints/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.Grid<
 #nullable restore
 #line (1,14)-(1,29) "x:\dir\subdir\Test\TestComponent.cshtml"
 WeatherForecast
@@ -60,15 +52,7 @@ internal static class TypeInference
         public static void CreateColumn_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TItem __syntheticArg0, int __seq0, global::System.Object __arg0, int __seq1, global::System.String __arg1, int __seq2, global::System.Object __arg2, int __seq3, global::System.Object __arg3)
             where TItem : class
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,10)-(3,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, "Title", __arg0);
         __builder.AddComponentParameter(__seq1, nameof(global::Test.Column<TItem>.
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_WithConstraints/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_WithConstraints/TestComponent.mappings.txt
index d6f18002bdc..cdbe8392a5c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_WithConstraints/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Inferred_WithConstraints/TestComponent.mappings.txt
@@ -1,25 +1,15 @@
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (785:22,0 [4] )
-|Grid|
-
-Source Location: (13:0,13 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |WeatherForecast|
-Generated Location: (938:30,0 [15] )
+Generated Location: (792:22,0 [15] )
 |WeatherForecast|
 
 Source Location: (39:0,39 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |Array.Empty<WeatherForecast>()|
-Generated Location: (1165:39,0 [30] )
+Generated Location: (1019:31,0 [30] )
 |Array.Empty<WeatherForecast>()|
 
-Source Location: (106:2,9 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (2305:65,0 [6] )
-|Column|
-
 Source Location: (126:2,29 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |FieldName|
-Generated Location: (2620:75,0 [9] )
+Generated Location: (2330:59,0 [9] )
 |FieldName|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Multilayer/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Multilayer/TestComponent.codegen.cs
index c18a0b811de..98ecd97969c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Multilayer/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Multilayer/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #nullable disable
                 , out var __typeInferenceArg_0___arg0);
                 global::__Blazor.Test.TestComponent.TypeInference.CreateAncestor_0(__builder, 0, 1, __typeInferenceArg_0___arg0, 2, (__builder2) => {
-                    __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (1,47)-(1,58) "x:\dir\subdir\Test\TestComponent.cshtml"
-Passthrough
-
-#line default
-#line hidden
-#nullable disable
-                    >(3);
+                    __builder2.OpenComponent<global::Test.Passthrough>(3);
                     __builder2.AddAttribute(4, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder3) => {
                         global::__Blazor.Test.TestComponent.TypeInference.CreateChild_1(__builder3, 5, __typeInferenceArg_0___arg0);
                     }
@@ -57,15 +49,7 @@ internal static class TypeInference
     {
         public static void CreateAncestor_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.IEnumerable<TItem> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,10) "x:\dir\subdir\Test\TestComponent.cshtml"
-Ancestor
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Ancestor<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Ancestor<TItem>.
 #nullable restore
 #line (1,11)-(1,16) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -85,15 +69,7 @@ public static void CreateAncestor_0_CaptureParameters<TItem>(global::System.Coll
         }
         public static void CreateChild_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Collections.Generic.IEnumerable<TItem> __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,60)-(1,65) "x:\dir\subdir\Test\TestComponent.cshtml"
-Child
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Child<TItem>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Multilayer/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Multilayer/TestComponent.mappings.txt
index 22e65305239..7b46f15e11a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Multilayer/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Multilayer/TestComponent.mappings.txt
@@ -3,23 +3,8 @@
 Generated Location: (854:23,0 [23] )
 |Array.Empty<DateTime>()|
 
-Source Location: (46:0,46 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|Passthrough|
-Generated Location: (1279:33,0 [11] )
-|Passthrough|
-
-Source Location: (1:0,1 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|Ancestor|
-Generated Location: (2445:62,0 [8] )
-|Ancestor|
-
 Source Location: (10:0,10 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (2697:71,0 [5] )
+Generated Location: (2398:55,0 [5] )
 |Items|
 
-Source Location: (59:0,59 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-|Child|
-Generated Location: (3505:90,0 [5] )
-|Child|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_MultipleTypes/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_MultipleTypes/TestComponent.codegen.cs
index 9b1a876a902..6ce87c69202 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_MultipleTypes/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_MultipleTypes/TestComponent.codegen.cs
@@ -61,15 +61,7 @@ internal static class TypeInference
     {
         public static void CreateParent_0<TKey, TValue, TOther>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.Dictionary<TKey, TValue> __arg0, int __seq1, TOther __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,8) "x:\dir\subdir\Test\TestComponent.cshtml"
-Parent
-
-#line default
-#line hidden
-#nullable disable
-        <TKey, TValue, TOther>>(seq);
+        __builder.OpenComponent<global::Test.Parent<TKey, TValue, TOther>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Parent<TKey, TValue, TOther>.
 #nullable restore
 #line (1,9)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -99,15 +91,7 @@ public static void CreateParent_0_CaptureParameters<TKey, TValue, TOther>(global
         }
         public static void CreateChild_1<TOther, TValue, TKey, TChildOnly>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TOther __syntheticArg0, global::System.Collections.Generic.Dictionary<TKey, TValue> __syntheticArg1, global::System.Collections.Generic.Dictionary<TKey, TValue> __syntheticArg2, int __seq0, global::System.Collections.Generic.ICollection<TChildOnly> __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,11) "x:\dir\subdir\Test\TestComponent.cshtml"
-Child
-
-#line default
-#line hidden
-#nullable disable
-        <TOther, TValue, TKey, TChildOnly>>(seq);
+        __builder.OpenComponent<global::Test.Child<TOther, TValue, TKey, TChildOnly>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Child<TOther, TValue, TKey, TChildOnly>.
 #nullable restore
 #line (2,12)-(2,26) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_MultipleTypes/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_MultipleTypes/TestComponent.mappings.txt
index fc8935ed8b7..cc45c286efa 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_MultipleTypes/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_MultipleTypes/TestComponent.mappings.txt
@@ -13,28 +13,18 @@ Source Location: (133:1,29 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1680:41,0 [23] )
 |new[] { 'a', 'b', 'c' }|
 
-Source Location: (1:0,1 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Parent|
-Generated Location: (2585:66,0 [6] )
-|Parent|
-
 Source Location: (8:0,8 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Data|
-Generated Location: (2862:75,0 [4] )
+Generated Location: (2720:67,0 [4] )
 |Data|
 
 Source Location: (75:0,75 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Other|
-Generated Location: (3120:84,0 [5] )
+Generated Location: (2978:76,0 [5] )
 |Other|
 
-Source Location: (109:1,5 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-|Child|
-Generated Location: (4237:104,0 [5] )
-|Child|
-
 Source Location: (115:1,11 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |ChildOnlyItems|
-Generated Location: (4537:113,0 [14] )
+Generated Location: (4252:97,0 [14] )
 |ChildOnlyItems|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_CreatesError/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_CreatesError/TestComponent.codegen.cs
index 8c97150b911..8f1513b1652 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_CreatesError/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_CreatesError/TestComponent.codegen.cs
@@ -39,15 +39,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.IEnumerable<TItem> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Grid<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<TItem>.
 #nullable restore
 #line (1,7)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -62,15 +54,7 @@ public static void CreateGrid_0<TItem>(global::Microsoft.AspNetCore.Components.R
         }
         public static void CreateColumn_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,43)-(1,49) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <object>>(seq);
+        __builder.OpenComponent<global::Test.Column<object>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_CreatesError/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_CreatesError/TestComponent.mappings.txt
index 90fc8b50336..6e56cf0909c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_CreatesError/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_CreatesError/TestComponent.mappings.txt
@@ -3,18 +3,8 @@
 Generated Location: (830:22,0 [23] )
 |Array.Empty<DateTime>()|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (1562:44,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (1805:53,0 [5] )
+Generated Location: (1663:45,0 [5] )
 |Items|
 
-Source Location: (42:0,42 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (2283:67,0 [6] )
-|Column|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Explicit/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Explicit/TestComponent.codegen.cs
index 38b43c564d1..f633456849b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Explicit/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Explicit/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.Grid<
 #nullable restore
 #line (1,14)-(1,22) "x:\dir\subdir\Test\TestComponent.cshtml"
 DateTime
@@ -66,15 +58,7 @@ internal static class TypeInference
     {
         public static void CreateColumn_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,60)-(1,66) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <object>>(seq);
+        __builder.OpenComponent<global::Test.Column<object>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Explicit/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Explicit/TestComponent.mappings.txt
index 5b27cb13283..d19c84ee2e3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Explicit/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Explicit/TestComponent.mappings.txt
@@ -1,25 +1,15 @@
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (785:22,0 [4] )
-|Grid|
-
-Source Location: (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |DateTime|
-Generated Location: (938:30,0 [8] )
+Generated Location: (792:22,0 [8] )
 |DateTime|
 
 Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (1184:39,0 [5] )
+Generated Location: (1038:31,0 [5] )
 |Items|
 
 Source Location: (32:0,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |Array.Empty<DateTime>()|
-Generated Location: (1480:47,0 [23] )
+Generated Location: (1334:39,0 [23] )
 |Array.Empty<DateTime>()|
 
-Source Location: (59:0,59 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (2220:71,0 [6] )
-|Column|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Inferred/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Inferred/TestComponent.codegen.cs
index 73c287cf0f6..c287f3224ae 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Inferred/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Inferred/TestComponent.codegen.cs
@@ -45,15 +45,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.IEnumerable<TItem> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Grid<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<TItem>.
 #nullable restore
 #line (1,7)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -73,28 +65,12 @@ public static void CreateGrid_0_CaptureParameters<TItem>(global::System.Collecti
         }
         public static void CreateColumn_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Collections.Generic.IEnumerable<TItem> __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,43)-(1,49) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.CloseComponent();
         }
         public static void CreateColumn_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Collections.Generic.IEnumerable<TItem> __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,53)-(1,59) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Inferred/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Inferred/TestComponent.mappings.txt
index f566ef91fca..07e6f873093 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Inferred/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_NotCascaded_Inferred/TestComponent.mappings.txt
@@ -3,23 +3,8 @@
 Generated Location: (850:23,0 [23] )
 |Array.Empty<DateTime>()|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (2091:50,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (2334:59,0 [5] )
+Generated Location: (2192:51,0 [5] )
 |Items|
 
-Source Location: (42:0,42 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (3139:78,0 [6] )
-|Column|
-
-Source Location: (52:0,52 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (3618:91,0 [6] )
-|Column|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override/TestComponent.codegen.cs
index f189786d1fe..281c40351b4 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override/TestComponent.codegen.cs
@@ -52,15 +52,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.IEnumerable<TItem> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Grid<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<TItem>.
 #nullable restore
 #line (1,7)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -80,15 +72,7 @@ public static void CreateGrid_0_CaptureParameters<TItem>(global::System.Collecti
         }
         public static void CreateColumn_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,43)-(1,49) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Column<TItem>.
 #nullable restore
 #line (1,50)-(1,63) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override/TestComponent.mappings.txt
index ed8c7a1dfc5..a64b450019f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override/TestComponent.mappings.txt
@@ -8,23 +8,13 @@ Source Location: (66:0,66 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1316:33,0 [13] )
 |"Some string"|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (2105:57,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (2348:66,0 [5] )
+Generated Location: (2206:58,0 [5] )
 |Items|
 
-Source Location: (42:0,42 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (3108:85,0 [6] )
-|Column|
-
 Source Location: (49:0,49 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |OverrideParam|
-Generated Location: (3356:94,0 [13] )
+Generated Location: (3070:78,0 [13] )
 |OverrideParam|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override_Multilayer/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override_Multilayer/TestComponent.codegen.cs
index 38829405f4d..9dd6f9f88a0 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override_Multilayer/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override_Multilayer/TestComponent.codegen.cs
@@ -76,15 +76,7 @@ internal static class TypeInference
     {
         public static void CreateTreeNode_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,10) "x:\dir\subdir\Test\TestComponent.cshtml"
-TreeNode
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.TreeNode<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.TreeNode<TItem>.
 #nullable restore
 #line (1,11)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -104,15 +96,7 @@ public static void CreateTreeNode_0_CaptureParameters<TItem>(TItem __arg0, out T
         }
         public static void CreateTreeNode_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,14) "x:\dir\subdir\Test\TestComponent.cshtml"
-TreeNode
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.TreeNode<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.TreeNode<TItem>.
 #nullable restore
 #line (2,15)-(2,19) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -132,15 +116,7 @@ public static void CreateTreeNode_1_CaptureParameters<TItem>(TItem __arg0, out T
         }
         public static void CreateTreeNode_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TItem __syntheticArg0, int __seq0, global::Microsoft.AspNetCore.Components.RenderFragment __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,10)-(3,18) "x:\dir\subdir\Test\TestComponent.cshtml"
-TreeNode
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.TreeNode<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, "ChildContent", __arg0);
         __builder.CloseComponent();
         }
@@ -151,15 +127,7 @@ public static void CreateTreeNode_2_CaptureParameters<TItem>(TItem __syntheticAr
         }
         public static void CreateTreeNode_3<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TItem __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (4,14)-(4,22) "x:\dir\subdir\Test\TestComponent.cshtml"
-TreeNode
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.TreeNode<TItem>>(seq);
         __builder.CloseComponent();
         }
 
@@ -169,15 +137,7 @@ public static void CreateTreeNode_3_CaptureParameters<TItem>(TItem __syntheticAr
         }
         public static void CreateTreeNode_4<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, TItem __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,6)-(7,14) "x:\dir\subdir\Test\TestComponent.cshtml"
-TreeNode
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.TreeNode<TItem>>(seq);
         __builder.CloseComponent();
         }
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override_Multilayer/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override_Multilayer/TestComponent.mappings.txt
index 3fc0e553efc..8d731b4cf42 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override_Multilayer/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Override_Multilayer/TestComponent.mappings.txt
@@ -8,38 +8,13 @@ Source Location: (54:1,21 [37] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1342:34,0 [37] )
 |System.Threading.Thread.CurrentThread|
 
-Source Location: (1:0,1 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|TreeNode|
-Generated Location: (4085:81,0 [8] )
-|TreeNode|
-
 Source Location: (10:0,10 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (4337:90,0 [4] )
+Generated Location: (4194:82,0 [4] )
 |Item|
 
-Source Location: (38:1,5 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|TreeNode|
-Generated Location: (5080:109,0 [8] )
-|TreeNode|
-
 Source Location: (47:1,14 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (5332:118,0 [4] )
+Generated Location: (5046:102,0 [4] )
 |Item|
 
-Source Location: (104:2,9 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|TreeNode|
-Generated Location: (6073:137,0 [8] )
-|TreeNode|
-
-Source Location: (128:3,13 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|TreeNode|
-Generated Location: (6782:156,0 [8] )
-|TreeNode|
-
-Source Location: (184:6,5 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|TreeNode|
-Generated Location: (7416:174,0 [8] )
-|TreeNode|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ParameterInNamespace/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ParameterInNamespace/TestComponent.codegen.cs
index b55688e968a..d1caa8a27ce 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ParameterInNamespace/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ParameterInNamespace/TestComponent.codegen.cs
@@ -51,15 +51,7 @@ internal static class TypeInference
     {
         public static void CreateParentComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::MyApp.MyClass<T> __arg0, int __seq1, Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::MyApp.Components.
-#nullable restore
-#line (3,2)-(3,17) "x:\dir\subdir\Test\TestComponent.cshtml"
-ParentComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::MyApp.Components.ParentComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::MyApp.Components.ParentComponent<T>.
 #nullable restore
 #line (3,18)-(3,27) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -79,15 +71,7 @@ public static void CreateParentComponent_0_CaptureParameters<T>(global::MyApp.My
         }
         public static void CreateChildComponent_1<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::MyApp.MyClass<T> __syntheticArg0)
         {
-        __builder.OpenComponent<global::MyApp.Components.
-#nullable restore
-#line (4,6)-(4,20) "x:\dir\subdir\Test\TestComponent.cshtml"
-ChildComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::MyApp.Components.ChildComponent<T>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ParameterInNamespace/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ParameterInNamespace/TestComponent.mappings.txt
index 72631b7b0a4..d77abcf4c27 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ParameterInNamespace/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_ParameterInNamespace/TestComponent.mappings.txt
@@ -8,18 +8,8 @@ Source Location: (59:2,28 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1019:30,0 [21] )
 |new MyClass<string>()|
 
-Source Location: (32:2,1 [15] x:\dir\subdir\Test\TestComponent.cshtml)
-|ParentComponent|
-Generated Location: (2165:56,0 [15] )
-|ParentComponent|
-
 Source Location: (48:2,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Parameter|
-Generated Location: (2435:65,0 [9] )
+Generated Location: (2292:57,0 [9] )
 |Parameter|
 
-Source Location: (89:3,5 [14] x:\dir\subdir\Test\TestComponent.cshtml)
-|ChildComponent|
-Generated Location: (3179:84,0 [14] )
-|ChildComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Partial_CreatesError/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Partial_CreatesError/TestComponent.codegen.cs
index 23a40ef42e6..6c35ab354d7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Partial_CreatesError/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Partial_CreatesError/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #nullable disable
                 , out var __typeInferenceArg_0___arg0);
                 global::__Blazor.Test.TestComponent.TypeInference.CreateGrid_0(__builder, 0, 1, __typeInferenceArg_0___arg0, 2, (__builder2) => {
-                    __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (1,43)-(1,49) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-                    >(3);
+                    __builder2.OpenComponent<global::Test.Column>(3);
                     __builder2.CloseComponent();
                 }
                 );
@@ -53,15 +45,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.IEnumerable<TItem> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Grid<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<TItem>.
 #nullable restore
 #line (1,7)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Partial_CreatesError/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Partial_CreatesError/TestComponent.mappings.txt
index fc88447ba0c..aa194e64609 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Partial_CreatesError/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Partial_CreatesError/TestComponent.mappings.txt
@@ -3,18 +3,8 @@
 Generated Location: (850:23,0 [23] )
 |Array.Empty<DateTime>()|
 
-Source Location: (42:0,42 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (1271:33,0 [6] )
-|Column|
-
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (2106:58,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (2349:67,0 [5] )
+Generated Location: (2051:51,0 [5] )
 |Items|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Tuple/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Tuple/TestComponent.codegen.cs
index 584d56692a6..ce7ec937614 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Tuple/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Tuple/TestComponent.codegen.cs
@@ -44,15 +44,7 @@ internal static class TypeInference
     {
         public static void CreateParentComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, (T, T) __arg0, int __seq1, Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,17) "x:\dir\subdir\Test\TestComponent.cshtml"
-ParentComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.ParentComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.ParentComponent<T>.
 #nullable restore
 #line (1,18)-(1,27) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -72,15 +64,7 @@ public static void CreateParentComponent_0_CaptureParameters<T>((T, T) __arg0, o
         }
         public static void CreateChildComponent_1<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, (T, T) __syntheticArg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,20) "x:\dir\subdir\Test\TestComponent.cshtml"
-ChildComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.ChildComponent<T>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Tuple/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Tuple/TestComponent.mappings.txt
index edf0b84bce6..08399705f57 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Tuple/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_Tuple/TestComponent.mappings.txt
@@ -3,18 +3,8 @@
 Generated Location: (861:23,0 [6] )
 |(1, 2)|
 
-Source Location: (1:0,1 [15] x:\dir\subdir\Test\TestComponent.cshtml)
-|ParentComponent|
-Generated Location: (1926:49,0 [15] )
-|ParentComponent|
-
 Source Location: (17:0,17 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Parameter|
-Generated Location: (2184:58,0 [9] )
+Generated Location: (2041:50,0 [9] )
 |Parameter|
 
-Source Location: (43:1,5 [14] x:\dir\subdir\Test\TestComponent.cshtml)
-|ChildComponent|
-Generated Location: (2862:77,0 [14] )
-|ChildComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithSplatAndKey/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithSplatAndKey/TestComponent.codegen.cs
index b99c13e858e..90effdc4f65 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithSplatAndKey/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithSplatAndKey/TestComponent.codegen.cs
@@ -78,15 +78,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.IEnumerable<TItem> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1, int __seq2, object __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Grid<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<TItem>.
 #nullable restore
 #line (2,25)-(2,30) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -107,15 +99,7 @@ public static void CreateGrid_0_CaptureParameters<TItem>(global::System.Collecti
         }
         public static void CreateColumn_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, global::System.Collections.Generic.IEnumerable<TItem> __syntheticArg0, int __seq0, global::System.Object __arg0, int __seq1, global::System.Object __arg1, int __seq2, object __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,6)-(3,12) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.Column<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, "Title", __arg0);
         __builder.AddComponentParameter(__seq1, "Another", __arg1);
         __builder.SetKey(__arg2);
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithSplatAndKey/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithSplatAndKey/TestComponent.mappings.txt
index f463d3a81b1..70722389f90 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithSplatAndKey/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithSplatAndKey/TestComponent.mappings.txt
@@ -23,18 +23,8 @@ Source Location: (78:1,13 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1940:60,0 [9] )
 |parentKey|
 
-Source Location: (66:1,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (2711:83,0 [4] )
-|Grid|
-
 Source Location: (89:1,24 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (2955:92,0 [5] )
+Generated Location: (2813:84,0 [5] )
 |Items|
 
-Source Location: (131:2,5 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (3905:112,0 [6] )
-|Column|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithUnrelatedType_CreatesError/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithUnrelatedType_CreatesError/TestComponent.codegen.cs
index 4a941a0407b..ba00f55e005 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithUnrelatedType_CreatesError/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithUnrelatedType_CreatesError/TestComponent.codegen.cs
@@ -43,15 +43,7 @@ internal static class TypeInference
     {
         public static void CreateGrid_0<TItem, TUnrelated>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Collections.Generic.Dictionary<TItem, TUnrelated> __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-Grid
-
-#line default
-#line hidden
-#nullable disable
-        <TItem, TUnrelated>>(seq);
+        __builder.OpenComponent<global::Test.Grid<TItem, TUnrelated>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.Grid<TItem, TUnrelated>.
 #nullable restore
 #line (1,7)-(1,12) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -71,15 +63,7 @@ public static void CreateGrid_0_CaptureParameters<TItem, TUnrelated>(global::Sys
         }
         public static void CreateColumn_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,49)-(1,55) "x:\dir\subdir\Test\TestComponent.cshtml"
-Column
-
-#line default
-#line hidden
-#nullable disable
-        <object>>(seq);
+        __builder.OpenComponent<global::Test.Column<object>>(seq);
         __builder.CloseComponent();
         }
     }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithUnrelatedType_CreatesError/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithUnrelatedType_CreatesError/TestComponent.mappings.txt
index 5c289c1d4c1..1d8f7b98b58 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithUnrelatedType_CreatesError/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/CascadingGenericInference_WithUnrelatedType_CreatesError/TestComponent.mappings.txt
@@ -3,18 +3,8 @@
 Generated Location: (850:23,0 [29] )
 |new Dictionary<int, string>()|
 
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|Grid|
-Generated Location: (1858:48,0 [4] )
-|Grid|
-
 Source Location: (6:0,6 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (2125:57,0 [5] )
+Generated Location: (1983:49,0 [5] )
 |Items|
 
-Source Location: (48:0,48 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Column|
-Generated Location: (2893:76,0 [6] )
-|Column|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_AtSpecifiedInRazorFileForTypeParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_AtSpecifiedInRazorFileForTypeParameter/TestComponent.codegen.cs
index b0864360f42..e084cc5099b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_AtSpecifiedInRazorFileForTypeParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_AtSpecifiedInRazorFileForTypeParameter/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,3) "x:\dir\subdir\Test\TestComponent.cshtml"
-C
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.C<
 #nullable restore
 #line (1,8)-(1,14) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_AtSpecifiedInRazorFileForTypeParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_AtSpecifiedInRazorFileForTypeParameter/TestComponent.mappings.txt
index f97b94f4d22..243d3b8dae8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_AtSpecifiedInRazorFileForTypeParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_AtSpecifiedInRazorFileForTypeParameter/TestComponent.mappings.txt
@@ -1,20 +1,15 @@
-Source Location: (1:0,1 [1] x:\dir\subdir\Test\TestComponent.cshtml)
-|C|
-Generated Location: (785:22,0 [1] )
-|C|
-
-Source Location: (7:0,7 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (7:0,7 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (934:30,0 [6] )
+Generated Location: (788:22,0 [6] )
 |string|
 
 Source Location: (15:0,15 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1173:39,0 [4] )
+Generated Location: (1027:31,0 [4] )
 |Item|
 
 Source Location: (21:0,21 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (1432:47,0 [1] )
+Generated Location: (1286:39,0 [1] )
 |1|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
index 5f4ccd65716..fafc27235b0 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,20)-(1,26) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
index 1df85955501..07c1fdbe6bf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic/TestComponent.mappings.txt
@@ -1,20 +1,15 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (946:30,0 [6] )
+Generated Location: (799:22,0 [6] )
 |string|
 
 Source Location: (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1195:39,0 [4] )
+Generated Location: (1048:31,0 [4] )
 |Item|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1440:47,0 [4] )
+Generated Location: (1293:39,0 [4] )
 |"hi"|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
index c771024da65..deb03ed6c6c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,20)-(1,26) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
index 8f0aeb9216f..5c858a09195 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind/TestComponent.mappings.txt
@@ -1,28 +1,23 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (946:30,0 [6] )
+Generated Location: (799:22,0 [6] )
 |string|
 
 Source Location: (32:0,32 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1195:39,0 [4] )
+Generated Location: (1048:31,0 [4] )
 |Item|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1440:47,0 [5] )
+Generated Location: (1293:39,0 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1848:59,0 [21] )
+Generated Location: (1701:51,0 [21] )
 |
     string Value;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
index ea3bdb192de..8dff7a2c7ea 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,20)-(1,26) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
index 0da4ff78983..acc1e254ed8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (946:30,0 [6] )
+Generated Location: (799:22,0 [6] )
 |string|
 
 Source Location: (37:0,37 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1163:39,0 [5] )
+Generated Location: (1016:31,0 [5] )
 |Value|
 
 Source Location: (53:1,7 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string Value;
 |
-Generated Location: (1612:51,0 [21] )
+Generated Location: (1465:43,0 [21] )
 |
     string Value;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
index c600934e1f9..c991536c002 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.codegen.cs
@@ -54,15 +54,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Object __arg1, int __seq2, global::System.Object __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,31)-(1,36) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
index 28d0c3d5676..271c7e1e1e2 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBindWeaklyTyped_TypeInference/TestComponent.mappings.txt
@@ -17,13 +17,8 @@ Generated Location: (1339:40,0 [21] )
     string Value;
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1922:59,0 [11] )
-|MyComponent|
-
 Source Location: (30:0,30 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2180:68,0 [5] )
+Generated Location: (2037:60,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
index 26f35e60173..b674d13fe66 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.codegen.cs
@@ -56,15 +56,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,20)-(1,24) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -79,15 +71,7 @@ public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Compo
         }
         public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<TItem> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (2,20)-(2,24) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
index 127e2398418..984477a5083 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericBind_TypeInference/TestComponent.mappings.txt
@@ -17,23 +17,13 @@ Generated Location: (1409:42,0 [21] )
     string Value;
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1957:61,0 [11] )
-|MyComponent|
-
 Source Location: (19:0,19 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2215:70,0 [4] )
+Generated Location: (2072:62,0 [4] )
 |Item|
 
-Source Location: (34:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2808:84,0 [11] )
-|MyComponent|
-
 Source Location: (52:1,19 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (3066:93,0 [4] )
+Generated Location: (2780:77,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index 6f5ac576f5a..9f419dc791d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,20)-(1,26) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
index a0f82a1a2ac..dfbc7b81986 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.mappings.txt
@@ -1,25 +1,20 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (946:30,0 [6] )
+Generated Location: (799:22,0 [6] )
 |string|
 
 Source Location: (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1195:39,0 [4] )
+Generated Location: (1048:31,0 [4] )
 |Item|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1440:47,0 [4] )
+Generated Location: (1293:39,0 [4] )
 |"hi"|
 
 Source Location: (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1824:57,25 [17] )
+Generated Location: (1677:49,25 [17] )
 |context.ToLower()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index 6cf52f87c20..bc3e7ee43b6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -49,15 +49,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
index 6712093836e..5bccfa66ffc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.mappings.txt
@@ -8,13 +8,8 @@ Source Location: (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1102:31,25 [17] )
 |context.ToLower()|
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1823:54,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2081:63,0 [4] )
+Generated Location: (1938:55,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
index 277bcdb7482..bd243512b16 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,20)-(1,26) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
index acc76ed0ba8..5ec19ffb6f7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute/TestComponent.mappings.txt
@@ -1,25 +1,20 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (946:30,0 [6] )
+Generated Location: (799:22,0 [6] )
 |string|
 
 Source Location: (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1195:39,0 [4] )
+Generated Location: (1048:31,0 [4] )
 |Item|
 
 Source Location: (34:0,34 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1440:47,0 [4] )
+Generated Location: (1293:39,0 [4] )
 |"hi"|
 
 Source Location: (50:0,50 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |17|
-Generated Location: (1653:56,0 [2] )
+Generated Location: (1506:48,0 [2] )
 |17|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
index 3e36885f749..a4fb9e5d0de 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.codegen.cs
@@ -45,15 +45,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Object __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
index 4b03ff4873b..83a7707fa63 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericWeaklyTypedAttribute_TypeInference/TestComponent.mappings.txt
@@ -8,13 +8,8 @@ Source Location: (37:0,37 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (994:30,0 [2] )
 |17|
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1581:50,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1839:59,0 [4] )
+Generated Location: (1696:51,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
index 588818df949..7eb36f2acfe 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.codegen.cs
@@ -37,15 +37,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
index 98d67bb2c68..c79b887e47f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference/TestComponent.mappings.txt
@@ -3,13 +3,8 @@
 Generated Location: (837:22,0 [4] )
 |"hi"|
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1384:42,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1642:51,0 [4] )
+Generated Location: (1499:43,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
index f06270f6b73..e7d214c1e89 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.codegen.cs
@@ -57,15 +57,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -79,15 +71,7 @@ public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Compo
         }
         public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (2,14)-(2,18) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -101,15 +85,7 @@ public static void CreateMyComponent_1<TItem>(global::Microsoft.AspNetCore.Compo
         }
         public static void CreateMyComponent_2<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (3,14)-(3,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
index f3148dcb8fe..ab7009a89c0 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Generic_TypeInference_Multiple/TestComponent.mappings.txt
@@ -13,33 +13,18 @@ Source Location: (93:2,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1461:42,0 [6] )
 |"bye!"|
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2010:62,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2268:71,0 [4] )
+Generated Location: (2125:63,0 [4] )
 |Item|
 
-Source Location: (32:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2701:84,0 [11] )
-|MyComponent|
-
 Source Location: (44:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2959:93,0 [4] )
+Generated Location: (2673:77,0 [4] )
 |Item|
 
-Source Location: (73:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (3392:106,0 [11] )
-|MyComponent|
-
 Source Location: (85:2,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (3650:115,0 [4] )
+Generated Location: (3221:91,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
index 96879ae3038..55503c40666 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.codegen.cs
@@ -42,15 +42,7 @@ void RenderChildComponent(RenderTreeBuilder __builder)
 #line hidden
 #nullable disable
 
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (8,10)-(8,21) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        >(0);
+        __builder.OpenComponent<global::Test.MyComponent>(0);
         __builder.CloseComponent();
 #nullable restore
 #line (9,1)-(10,1) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
index e756c2c3fb3..625e2ec6820 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InFunctionsDirective/TestComponent.mappings.txt
@@ -19,15 +19,10 @@ Generated Location: (1104:36,0 [69] )
     {
 |
 
-Source Location: (179:7,9 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1354:47,0 [11] )
-|MyComponent|
-
 Source Location: (195:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1550:56,0 [7] )
+Generated Location: (1406:48,0 [7] )
 |    }
 |
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index f01fd998cd2..640af7a3e18 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -32,15 +32,7 @@ void RenderChildComponent()
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (5,10)-(5,21) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.CloseComponent();
 #nullable restore
 #line (6,1)-(7,1) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 653637855bd..1171bbd3388 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -14,20 +14,15 @@ Generated Location: (887:26,0 [42] )
     {
 |
 
-Source Location: (105:4,9 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1114:37,0 [11] )
-|MyComponent|
-
 Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1317:46,0 [7] )
+Generated Location: (1169:38,0 [7] )
 |    }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1457:54,0 [25] )
+Generated Location: (1309:46,0 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index c1eeec4fa16..b5e9c32578d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,21)-(1,27) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
index 21eda9f3dbb..fbfb0c0b8ca 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.mappings.txt
@@ -1,35 +1,30 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (946:30,0 [6] )
+Generated Location: (799:22,0 [6] )
 |string|
 
 Source Location: (34:0,34 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (1102:38,0 [3] )
+Generated Location: (955:30,0 [3] )
 |int|
 
 Source Location: (38:0,38 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1353:47,0 [4] )
+Generated Location: (1206:39,0 [4] )
 |Item|
 
 Source Location: (46:0,46 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hi"|
-Generated Location: (1598:55,0 [4] )
+Generated Location: (1451:47,0 [4] )
 |"hi"|
 
 Source Location: (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLower()|
-Generated Location: (1983:65,25 [17] )
+Generated Location: (1836:57,25 [17] )
 |context.ToLower()|
 
 Source Location: (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 |System.Math.Max(0, item.Item)|
-Generated Location: (2443:77,25 [29] )
+Generated Location: (2296:69,25 [29] )
 |System.Math.Max(0, item.Item)|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index c0e6d363f52..580bdbcde86 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -68,15 +68,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem1 __arg0, int __seq1, global::System.Collections.Generic.List<TItem2> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<TItem1> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.MyComponent<TItem1, TItem2>.Context> __arg3)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem1, TItem2>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem1, TItem2>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem1, TItem2>.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
index b95a5840174..7b9d32ef19b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.mappings.txt
@@ -18,18 +18,13 @@ Source Location: (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1575:50,25 [29] )
 |System.Math.Max(0, item.Item)|
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2526:73,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2802:82,0 [4] )
+Generated Location: (2659:74,0 [4] )
 |Item|
 
 Source Location: (28:0,28 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Items|
-Generated Location: (3059:91,0 [5] )
+Generated Location: (2916:83,0 [5] )
 |Items|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
index 93ac3245582..51c718a7cf7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.codegen.cs
@@ -57,15 +57,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<global::System.Int32> __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
index c9f8b50b802..94c646bf5d7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_NonGenericParameterizedChildContent_TypeInference/TestComponent.mappings.txt
@@ -13,13 +13,8 @@ Source Location: (103:2,16 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1315:40,25 [7] )
 |context|
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2079:62,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2337:71,0 [4] )
+Generated Location: (2194:63,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
index fbd0a5dc70a..077852cf6cb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt
deleted file mode 100644
index 2d715cab12f..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_Simple/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
index b13f58dd1ea..262644b2a87 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt
index 0fce1760806..921c305e44c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithChildContent/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyAttr|
-Generated Location: (1031:31,0 [6] )
+Generated Location: (884:23,0 [6] )
 |MyAttr|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
index 0c14a322469..ba9ce0ce88a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddMarkupContent(2, "<child>hello</child>");
             }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt
deleted file mode 100644
index 2d715cab12f..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithElementOnlyChildContent/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
index c7db6f6924c..0e83d6b56ce 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(2, "hello");
             }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt
deleted file mode 100644
index 2d715cab12f..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitChildContent/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
index cf9e875d10b..dde5917e7ee 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
index 3ff21039238..94c96b14b11 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitEventHandler/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |OnClick|
 
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1239:39,0 [9] )
+Generated Location: (1092:31,0 [9] )
 |Increment|
 
 Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +15,7 @@ Source Location: (46:2,7 [98] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1487:50,0 [98] )
+Generated Location: (1340:42,0 [98] )
 |
     private int counter;
     private void Increment(EventArgs e) {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
index 4779d20be8c..5034108757f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment<global::System.String>)((context) => (__builder2) => {
 #nullable restore
 #line (1,29)-(1,36) 25 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
index 40d1ab12d35..f15706a320f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitGenericChildContent/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1144:31,25 [7] )
+Generated Location: (997:23,25 [7] )
 |context|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
index 527b5975280..b5b931e20fe 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
index 5aa9cd8ab10..e9caeb22f6a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithExplicitStringParameter/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |StringProperty|
-Generated Location: (1031:31,0 [14] )
+Generated Location: (884:23,0 [14] )
 |StringProperty|
 
 Source Location: (31:0,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |42.ToString()|
-Generated Location: (1301:39,0 [13] )
+Generated Location: (1154:31,0 [13] )
 |42.ToString()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
index 2274f1c8707..6ac50e31a9d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
index 043f01fc365..708adf16209 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyAttr|
-Generated Location: (1031:31,0 [6] )
+Generated Location: (884:23,0 [6] )
 |MyAttr|
 
 Source Location: (54:0,54 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 |context.ToLowerInvariant()|
-Generated Location: (1558:43,25 [26] )
+Generated Location: (1411:35,25 [26] )
 |context.ToLowerInvariant()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index 9fec462ca19..87d7669aa9b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
index 04efaa183f8..72cb45e83be 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyAttr|
-Generated Location: (1031:31,0 [6] )
+Generated Location: (884:23,0 [6] )
 |MyAttr|
 
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1569:43,25 [23] )
+Generated Location: (1422:35,25 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index 9fec462ca19..87d7669aa9b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
index 04efaa183f8..72cb45e83be 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyAttr|
-Generated Location: (1031:31,0 [6] )
+Generated Location: (884:23,0 [6] )
 |MyAttr|
 
 Source Location: (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
 |item.ToLowerInvariant()|
-Generated Location: (1569:43,25 [23] )
+Generated Location: (1422:35,25 [23] )
 |item.ToLowerInvariant()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
index b902b725faf..9d3de935495 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
index 28bbff44ee5..9e81c5f14dc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithLambdaEventHandler/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |OnClick|
 
 Source Location: (24:0,24 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |e => { Increment(); }|
-Generated Location: (1239:39,0 [21] )
+Generated Location: (1092:31,0 [21] )
 |e => { Increment(); }|
 
 Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +15,7 @@ Source Location: (60:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1499:50,0 [87] )
+Generated Location: (1352:42,0 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
index e8b8fac82a6..68ee82ccf78 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "some-attribute", "foo");
             __builder.AddComponentParameter(2, "another-attribute", 
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
index e162fd669ac..36f4b7660ab 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithNonPropertyAttributes/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:0,55 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |43.ToString()|
-Generated Location: (1094:32,0 [13] )
+Generated Location: (947:24,0 [13] )
 |43.ToString()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
index 59b15727489..fa218535057 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.codegen.cs
@@ -37,15 +37,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
index f6a67992997..dfc8c3bb5e4 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithPageDirective/TestComponent.mappings.txt
@@ -8,8 +8,3 @@ Source Location: (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (749:26,0 [20] )
 |"/AnotherRoute/{id}"|
 
-Source Location: (46:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1287:42,0 [11] )
-|MyComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
index dcce8bf47c5..b8a7004c525 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,5)-(2,16) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
index b8b9e57112c..10e3337479b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithParameters/TestComponent.mappings.txt
@@ -1,40 +1,35 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (18:1,4 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (18:1,4 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |IntProperty|
-Generated Location: (1030:31,0 [11] )
+Generated Location: (883:23,0 [11] )
 |IntProperty|
 
 Source Location: (31:1,17 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |123|
-Generated Location: (1296:39,0 [3] )
+Generated Location: (1149:31,0 [3] )
 |123|
 
 Source Location: (41:2,4 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |BoolProperty|
-Generated Location: (1530:48,0 [12] )
+Generated Location: (1383:40,0 [12] )
 |BoolProperty|
 
 Source Location: (55:2,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1799:56,0 [4] )
+Generated Location: (1652:48,0 [4] )
 |true|
 
 Source Location: (66:3,4 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |StringProperty|
-Generated Location: (2034:65,0 [14] )
+Generated Location: (1887:57,0 [14] )
 |StringProperty|
 
 Source Location: (98:4,4 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |ObjectProperty|
-Generated Location: (2292:74,0 [14] )
+Generated Location: (2145:66,0 [14] )
 |ObjectProperty|
 
 Source Location: (114:4,20 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |new SomeType()|
-Generated Location: (2562:82,0 [14] )
+Generated Location: (2415:74,0 [14] )
 |new SomeType()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
index 8a578700c07..cb0d3aaa8fb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.codegen.cs
@@ -23,15 +23,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-DynamicElement
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.DynamicElement>(0);
             __builder.AddComponentParameter(1, "onclick", global::Microsoft.AspNetCore.Components.EventCallback.Factory.Create<global::Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
 #line (2,27)-(2,34) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
index b5a73492cef..4fa8548079e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithWeaklyTypeEventHandler/TestComponent.mappings.txt
@@ -3,21 +3,16 @@
 Generated Location: (372:12,0 [41] )
 |using Microsoft.AspNetCore.Components.Web|
 
-Source Location: (45:1,1 [14] x:\dir\subdir\Test\TestComponent.cshtml)
-|DynamicElement|
-Generated Location: (938:28,0 [14] )
-|DynamicElement|
-
 Source Location: (70:1,26 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1300:37,0 [7] )
+Generated Location: (1153:29,0 [7] )
 |OnClick|
 
 Source Location: (92:3,7 [60] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
-Generated Location: (1546:48,0 [60] )
+Generated Location: (1399:40,0 [60] )
 |
     private Action<MouseEventArgs> OnClick { get; set; }
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
index df93167c7a9..b7264a446f4 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.codegen.cs
@@ -23,30 +23,14 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,17) "x:\dir\subdir\Test\TestComponent.cshtml"
-HeaderComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.HeaderComponent>(0);
             __builder.AddAttribute(1, "Header", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(2, "Hi!");
             }
             ));
             __builder.CloseComponent();
             __builder.AddMarkupContent(3, "\r\n");
-            __builder.OpenComponent<global::AnotherTest.
-#nullable restore
-#line (6,2)-(6,17) "x:\dir\subdir\Test\TestComponent.cshtml"
-FooterComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(4);
+            __builder.OpenComponent<global::AnotherTest.FooterComponent>(4);
             __builder.AddAttribute(5, "Footer", (global::Microsoft.AspNetCore.Components.RenderFragment<global::System.DateTime>)((context) => (__builder2) => {
 #nullable restore
 #line (7,14)-(7,21) 25 "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -60,30 +44,14 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             ));
             __builder.CloseComponent();
             __builder.AddMarkupContent(7, "\r\n");
-            __builder.OpenComponent<global::
-#nullable restore
-#line (9,2)-(9,22) "x:\dir\subdir\Test\TestComponent.cshtml"
-Test.HeaderComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(8);
+            __builder.OpenComponent<global::Test.HeaderComponent>(8);
             __builder.AddAttribute(9, "Header", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(10, "Hi!");
             }
             ));
             __builder.CloseComponent();
             __builder.AddMarkupContent(11, "\r\n");
-            __builder.OpenComponent<global::
-#nullable restore
-#line (12,2)-(12,29) "x:\dir\subdir\Test\TestComponent.cshtml"
-AnotherTest.FooterComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(12);
+            __builder.OpenComponent<global::AnotherTest.FooterComponent>(12);
             __builder.AddAttribute(13, "Footer", (global::Microsoft.AspNetCore.Components.RenderFragment<global::System.DateTime>)((context) => (__builder2) => {
 #nullable restore
 #line (13,14)-(13,21) 26 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
index 398fe7305dd..a757122c03c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildContent_FromAnotherNamespace/TestComponent.mappings.txt
@@ -3,33 +3,13 @@
 Generated Location: (372:12,0 [17] )
 |using AnotherTest|
 
-Source Location: (23:2,1 [15] x:\dir\subdir\Test\TestComponent.cshtml)
-|HeaderComponent|
-Generated Location: (914:28,0 [15] )
-|HeaderComponent|
-
-Source Location: (88:5,1 [15] x:\dir\subdir\Test\TestComponent.cshtml)
-|FooterComponent|
-Generated Location: (1438:43,0 [15] )
-|FooterComponent|
-
 Source Location: (119:6,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (1796:52,25 [7] )
+Generated Location: (1502:36,25 [7] )
 |context|
 
-Source Location: (158:8,1 [20] x:\dir\subdir\Test\TestComponent.cshtml)
-|Test.HeaderComponent|
-Generated Location: (2127:65,0 [20] )
-|Test.HeaderComponent|
-
-Source Location: (233:11,1 [27] x:\dir\subdir\Test\TestComponent.cshtml)
-|AnotherTest.FooterComponent|
-Generated Location: (2648:80,0 [27] )
-|AnotherTest.FooterComponent|
-
 Source Location: (276:12,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |context|
-Generated Location: (3023:89,26 [7] )
+Generated Location: (2433:57,26 [7] )
 |context|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
index e483ed336e2..8cce71c01f8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-CoolnessMeter
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.CoolnessMeter>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.CoolnessMeter.
 #nullable restore
 #line (1,16)-(1,24) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
index d2c5552dc33..f1a67c9fd9f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentParameter_TypeMismatch_ReportsDiagnostic/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|CoolnessMeter|
-Generated Location: (786:22,0 [13] )
-|CoolnessMeter|
-
-Source Location: (15:0,15 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (15:0,15 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |Coolness|
-Generated Location: (1035:31,0 [8] )
+Generated Location: (888:23,0 [8] )
 |Coolness|
 
 Source Location: (27:0,27 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |"very-cool"|
-Generated Location: (1298:39,0 [11] )
+Generated Location: (1151:31,0 [11] )
 |"very-cool"|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter/TestComponent.codegen.cs
index c564e2e1dc2..5945c30da02 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             );
             __builder.CloseElement();
             __builder.AddMarkupContent(2, "\r\n\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Test.TestComponent>(3);
             __builder.AddComponentParameter(4, nameof(global::Test.TestComponent.
 #nullable restore
 #line (3,16)-(3,24) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter/TestComponent.mappings.txt
index 8eda8c21493..2609d6c9677 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter/TestComponent.mappings.txt
@@ -3,19 +3,14 @@
 Generated Location: (812:22,24 [8] )
 |TestBool|
 
-Source Location: (31:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1115:33,0 [13] )
-|TestComponent|
-
 Source Location: (45:2,15 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |TestBool|
-Generated Location: (1364:42,0 [8] )
+Generated Location: (1217:34,0 [8] )
 |TestBool|
 
 Source Location: (55:2,25 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (1629:50,0 [4] )
+Generated Location: (1482:42,0 [4] )
 |true|
 
 Source Location: (74:4,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -23,7 +18,7 @@ Source Location: (74:4,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public bool TestBool { get; set; }
 |
-Generated Location: (1872:61,0 [59] )
+Generated Location: (1725:53,0 [59] )
 |
     [Parameter]
     public bool TestBool { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter_Minimized/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter_Minimized/TestComponent.codegen.cs
index 97796a2acf9..de678362ce7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter_Minimized/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter_Minimized/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             );
             __builder.CloseElement();
             __builder.AddMarkupContent(2, "\r\n\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Test.TestComponent>(3);
             __builder.AddComponentParameter(4, nameof(global::Test.TestComponent.
 #nullable restore
 #line (3,16)-(3,24) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter_Minimized/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter_Minimized/TestComponent.mappings.txt
index d5974f46ff7..d53ce74b8e7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter_Minimized/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithBooleanParameter_Minimized/TestComponent.mappings.txt
@@ -3,14 +3,9 @@
 Generated Location: (812:22,24 [8] )
 |TestBool|
 
-Source Location: (31:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1115:33,0 [13] )
-|TestComponent|
-
 Source Location: (45:2,15 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |TestBool|
-Generated Location: (1364:42,0 [8] )
+Generated Location: (1217:34,0 [8] )
 |TestBool|
 
 Source Location: (67:4,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +13,7 @@ Source Location: (67:4,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public bool TestBool { get; set; }
 |
-Generated Location: (1617:53,0 [59] )
+Generated Location: (1470:45,0 [59] )
 |
     [Parameter]
     public bool TestBool { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.codegen.cs
index d5ebdb62653..3793973e39f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.codegen.cs
@@ -86,15 +86,7 @@ public static void CreateTestComponent_0<TItem1, TItem2, TItem3>(global::Microso
             where TItem2 : global::ITag
             where TItem3 : global::Image, new()
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,15) "x:\dir\subdir\Test\UseTestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem1, TItem2, TItem3>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<TItem1, TItem2, TItem3>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.TestComponent<TItem1, TItem2, TItem3>.
 #nullable restore
 #line (2,16)-(2,21) "x:\dir\subdir\Test\UseTestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.mappings.txt
index cd761a708eb..fc1bc97692d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters/UseTestComponent.mappings.txt
@@ -38,23 +38,18 @@ Generated Location: (1848:66,0 [268] )
     List<Tag> items = new List<Tag>() { tag1, tag2 };
 |
 
-Source Location: (14:1,1 [13] x:\dir\subdir\Test\UseTestComponent.cshtml)
-|TestComponent|
-Generated Location: (2930:91,0 [13] )
-|TestComponent|
-
 Source Location: (28:1,15 [5] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Item1|
-Generated Location: (3229:100,0 [5] )
+Generated Location: (3083:92,0 [5] )
 |Item1|
 
 Source Location: (41:1,28 [6] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Items2|
-Generated Location: (3500:109,0 [6] )
+Generated Location: (3354:101,0 [6] )
 |Items2|
 
 Source Location: (55:1,42 [5] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Item3|
-Generated Location: (3772:118,0 [5] )
+Generated Location: (3626:110,0 [5] )
 |Item3|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.codegen.cs
index d5ebdb62653..3793973e39f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.codegen.cs
@@ -86,15 +86,7 @@ public static void CreateTestComponent_0<TItem1, TItem2, TItem3>(global::Microso
             where TItem2 : global::ITag
             where TItem3 : global::Image, new()
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,15) "x:\dir\subdir\Test\UseTestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem1, TItem2, TItem3>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<TItem1, TItem2, TItem3>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.TestComponent<TItem1, TItem2, TItem3>.
 #nullable restore
 #line (2,16)-(2,21) "x:\dir\subdir\Test\UseTestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.mappings.txt
index cd761a708eb..fc1bc97692d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithConstrainedTypeParameters_WithSemicolon/UseTestComponent.mappings.txt
@@ -38,23 +38,18 @@ Generated Location: (1848:66,0 [268] )
     List<Tag> items = new List<Tag>() { tag1, tag2 };
 |
 
-Source Location: (14:1,1 [13] x:\dir\subdir\Test\UseTestComponent.cshtml)
-|TestComponent|
-Generated Location: (2930:91,0 [13] )
-|TestComponent|
-
 Source Location: (28:1,15 [5] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Item1|
-Generated Location: (3229:100,0 [5] )
+Generated Location: (3083:92,0 [5] )
 |Item1|
 
 Source Location: (41:1,28 [6] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Items2|
-Generated Location: (3500:109,0 [6] )
+Generated Location: (3354:101,0 [6] )
 |Items2|
 
 Source Location: (55:1,42 [5] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Item3|
-Generated Location: (3772:118,0 [5] )
+Generated Location: (3626:110,0 [5] )
 |Item3|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDecimalParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDecimalParameter/TestComponent.codegen.cs
index 1d094c00186..e52864540f4 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDecimalParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDecimalParameter/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             );
             __builder.CloseElement();
             __builder.AddMarkupContent(2, "\r\n\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Test.TestComponent>(3);
             __builder.AddComponentParameter(4, nameof(global::Test.TestComponent.
 #nullable restore
 #line (3,16)-(3,27) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDecimalParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDecimalParameter/TestComponent.mappings.txt
index 616a198f38e..f50c7d66b95 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDecimalParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDecimalParameter/TestComponent.mappings.txt
@@ -3,19 +3,14 @@
 Generated Location: (812:22,24 [11] )
 |TestDecimal|
 
-Source Location: (34:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1118:33,0 [13] )
-|TestComponent|
-
 Source Location: (48:2,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |TestDecimal|
-Generated Location: (1367:42,0 [11] )
+Generated Location: (1220:34,0 [11] )
 |TestDecimal|
 
 Source Location: (61:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |4|
-Generated Location: (1635:50,0 [1] )
+Generated Location: (1488:42,0 [1] )
 |4|
 
 Source Location: (77:4,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -23,7 +18,7 @@ Source Location: (77:4,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public decimal TestDecimal { get; set; }
 |
-Generated Location: (1875:61,0 [65] )
+Generated Location: (1728:53,0 [65] )
 |
     [Parameter]
     public decimal TestDecimal { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDynamicParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDynamicParameter/TestComponent.codegen.cs
index 6e1c3a7a67e..5bab0ce4eef 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDynamicParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDynamicParameter/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             );
             __builder.CloseElement();
             __builder.AddMarkupContent(2, "\r\n\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Test.TestComponent>(3);
             __builder.AddComponentParameter(4, nameof(global::Test.TestComponent.
 #nullable restore
 #line (3,16)-(3,27) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDynamicParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDynamicParameter/TestComponent.mappings.txt
index 2ec25f7296d..2070d090666 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDynamicParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithDynamicParameter/TestComponent.mappings.txt
@@ -3,19 +3,14 @@
 Generated Location: (812:22,24 [11] )
 |TestDynamic|
 
-Source Location: (34:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1118:33,0 [13] )
-|TestComponent|
-
 Source Location: (48:2,15 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |TestDynamic|
-Generated Location: (1367:42,0 [11] )
+Generated Location: (1220:34,0 [11] )
 |TestDynamic|
 
 Source Location: (61:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |4|
-Generated Location: (1620:50,0 [1] )
+Generated Location: (1473:42,0 [1] )
 |4|
 
 Source Location: (77:4,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -23,7 +18,7 @@ Source Location: (77:4,7 [65] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public dynamic TestDynamic { get; set; }
 |
-Generated Location: (1860:61,0 [65] )
+Generated Location: (1713:53,0 [65] )
 |
     [Parameter]
     public dynamic TestDynamic { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTupleParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTupleParameter/TestComponent.codegen.cs
index e1ab7a728d7..6eaef762d1c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTupleParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTupleParameter/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (5,2)-(5,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.TestComponent.
 #nullable restore
 #line (5,16)-(5,22) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTupleParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTupleParameter/TestComponent.mappings.txt
index 9169acb5bbf..e1507a1b339 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTupleParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTupleParameter/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (91:4,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (105:4,15 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (105:4,15 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Gutter|
-Generated Location: (1035:31,0 [6] )
+Generated Location: (888:23,0 [6] )
 |Gutter|
 
 Source Location: (113:4,23 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |(32, 16)|
-Generated Location: (1340:39,0 [8] )
+Generated Location: (1193:31,0 [8] )
 |(32, 16)|
 
 Source Location: (7:0,7 [78] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     [Parameter] public (int Horizontal, int Vertical) Gutter { get; set; }
 |
-Generated Location: (1587:50,0 [78] )
+Generated Location: (1440:42,0 [78] )
 |
     [Parameter] public (int Horizontal, int Vertical) Gutter { get; set; }
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.codegen.cs
index 39e4740ac36..65378aff2bf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.codegen.cs
@@ -83,15 +83,7 @@ internal static class TypeInference
     {
         public static void CreateTestComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem[] __arg0, int __seq1, global::System.Collections.Generic.List<TItem[]> __arg1, int __seq2, global::System.Func<TItem[]> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment<TItem[]> __arg3)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,15) "x:\dir\subdir\Test\UseTestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.TestComponent<TItem>.
 #nullable restore
 #line (2,16)-(2,22) "x:\dir\subdir\Test\UseTestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.mappings.txt
index 583b7d80c43..0d3fb39c7be 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterArray/UseTestComponent.mappings.txt
@@ -38,23 +38,18 @@ Generated Location: (1866:66,0 [208] )
     Tag[] items3() => new [] { tag };
 |
 
-Source Location: (14:1,1 [13] x:\dir\subdir\Test\UseTestComponent.cshtml)
-|TestComponent|
-Generated Location: (2764:88,0 [13] )
-|TestComponent|
-
 Source Location: (28:1,15 [6] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Items1|
-Generated Location: (3029:97,0 [6] )
+Generated Location: (2883:89,0 [6] )
 |Items1|
 
 Source Location: (42:1,29 [6] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Items2|
-Generated Location: (3284:106,0 [6] )
+Generated Location: (3138:98,0 [6] )
 |Items2|
 
 Source Location: (56:1,43 [6] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Items3|
-Generated Location: (3539:115,0 [6] )
+Generated Location: (3393:107,0 [6] )
 |Items3|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.codegen.cs
index 007bba53d4c..f2ae203820c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.codegen.cs
@@ -74,15 +74,7 @@ internal static class TypeInference
     {
         public static void CreateTestComponent_0<TItem1, TItem2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, (TItem1, TItem2) __arg0, int __seq1, global::System.Collections.Generic.List<(TItem1, TItem2)> __arg1, int __seq2, global::Microsoft.AspNetCore.Components.RenderFragment<(TItem1, TItem2)> __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,15) "x:\dir\subdir\Test\UseTestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem1, TItem2>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<TItem1, TItem2>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.TestComponent<TItem1, TItem2>.
 #nullable restore
 #line (2,16)-(2,21) "x:\dir\subdir\Test\UseTestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.mappings.txt
index 4858758fc84..9cba9469875 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple/UseTestComponent.mappings.txt
@@ -31,18 +31,13 @@ Generated Location: (1688:58,0 [176] )
     List<(string, int)> items2 = new List<(string, int)>() { item2 };
 |
 
-Source Location: (14:1,1 [13] x:\dir\subdir\Test\UseTestComponent.cshtml)
-|TestComponent|
-Generated Location: (2541:79,0 [13] )
-|TestComponent|
-
 Source Location: (28:1,15 [5] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Item1|
-Generated Location: (2824:88,0 [5] )
+Generated Location: (2678:80,0 [5] )
 |Item1|
 
 Source Location: (40:1,27 [6] x:\dir\subdir\Test\UseTestComponent.cshtml)
 |Items2|
-Generated Location: (3087:97,0 [6] )
+Generated Location: (2941:89,0 [6] )
 |Items2|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.codegen.cs
index ce3e7c21d1f..954230879bc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.codegen.cs
@@ -83,15 +83,7 @@ internal static class TypeInference
     {
         public static void CreateTestComponent_0<TParam>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TParam __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<(global::N.MyClass I1, global::N.MyStruct I2, TParam P)> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (12,2)-(12,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TParam>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<TParam>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.TestComponent<TParam>.
 #nullable restore
 #line (12,16)-(12,26) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.mappings.txt
index bd46e7ae629..046a170062f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTupleGloballyQualifiedTypes/TestComponent.mappings.txt
@@ -40,13 +40,8 @@ Generated Location: (1828:65,0 [169] )
     public RenderFragment<(MyClass I1, MyStruct I2, TParam P)> Template { get; set; }
 |
 
-Source Location: (213:11,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (2613:88,0 [13] )
-|TestComponent|
-
 Source Location: (227:11,15 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |InferParam|
-Generated Location: (2879:97,0 [10] )
+Generated Location: (2734:89,0 [10] )
 |InferParam|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple_ExplicitGenericArguments/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple_ExplicitGenericArguments/TestComponent.codegen.cs
index b19d568669c..f6ee1de6824 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple_ExplicitGenericArguments/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple_ExplicitGenericArguments/TestComponent.codegen.cs
@@ -47,15 +47,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (4,2)-(4,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.TestComponent<
 #nullable restore
 #line (4,37)-(4,44) "x:\dir\subdir\Test\TestComponent.cshtml"
 decimal
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple_ExplicitGenericArguments/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple_ExplicitGenericArguments/TestComponent.mappings.txt
index 21c138d1c88..468cb65949a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple_ExplicitGenericArguments/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameterValueTuple_ExplicitGenericArguments/TestComponent.mappings.txt
@@ -18,29 +18,24 @@ Source Location: (61:1,18 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (981:39,0 [21] )
 |where TValue : struct|
 
-Source Location: (87:3,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1393:52,0 [13] )
-|TestComponent|
-
 Source Location: (122:3,36 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |decimal|
-Generated Location: (1555:60,0 [7] )
+Generated Location: (1408:52,0 [7] )
 |decimal|
 
 Source Location: (139:3,53 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |decimal|
-Generated Location: (1712:68,0 [7] )
+Generated Location: (1565:60,0 [7] )
 |decimal|
 
 Source Location: (101:3,15 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Data|
-Generated Location: (1974:77,0 [4] )
+Generated Location: (1827:69,0 [4] )
 |Data|
 
 Source Location: (107:3,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |null|
-Generated Location: (2285:85,0 [4] )
+Generated Location: (2138:77,0 [4] )
 |null|
 
 Source Location: (161:5,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -48,7 +43,7 @@ Source Location: (161:5,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public List<(TDomain Domain, TValue Value)> Data { get; set; }
 |
-Generated Location: (2528:96,0 [87] )
+Generated Location: (2381:88,0 [87] )
 |
     [Parameter]
     public List<(TDomain Domain, TValue Value)> Data { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute/TestComponent.codegen.cs
index 416e67200ab..18bba287c83 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute/TestComponent.mappings.txt
index cd20ede688e..511a568cbcc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |StringProperty|
-Generated Location: (1031:31,0 [14] )
+Generated Location: (884:23,0 [14] )
 |StringProperty|
 
 Source Location: (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEnum|
-Generated Location: (1301:39,0 [6] )
+Generated Location: (1154:31,0 [6] )
 |MyEnum|
 
 Source Location: (52:2,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -21,7 +16,7 @@ Source Location: (52:2,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
         Two
     }
 |
-Generated Location: (1546:50,0 [67] )
+Generated Location: (1399:42,0 [67] )
 |
     public enum MyEnum
     {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_02/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_02/TestComponent.codegen.cs
index 416e67200ab..18bba287c83 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_02/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_02/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_02/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_02/TestComponent.mappings.txt
index cd20ede688e..511a568cbcc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_02/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_02/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |StringProperty|
-Generated Location: (1031:31,0 [14] )
+Generated Location: (884:23,0 [14] )
 |StringProperty|
 
 Source Location: (30:0,30 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEnum|
-Generated Location: (1301:39,0 [6] )
+Generated Location: (1154:31,0 [6] )
 |MyEnum|
 
 Source Location: (52:2,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -21,7 +16,7 @@ Source Location: (52:2,7 [67] x:\dir\subdir\Test\TestComponent.cshtml)
         Two
     }
 |
-Generated Location: (1546:50,0 [67] )
+Generated Location: (1399:42,0 [67] )
 |
     public enum MyEnum
     {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_03/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_03/TestComponent.codegen.cs
index 428794bc50d..cf9517c771a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_03/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_03/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_03/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_03/TestComponent.mappings.txt
index 7165dfc37a9..df7687f3876 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_03/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_ComplexContentInAttribute_03/TestComponent.mappings.txt
@@ -1,28 +1,23 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |StringProperty|
-Generated Location: (1031:31,0 [14] )
+Generated Location: (884:23,0 [14] )
 |StringProperty|
 
 Source Location: (30:0,30 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |x|
-Generated Location: (1301:39,0 [1] )
+Generated Location: (1154:31,0 [1] )
 |x|
 
 Source Location: (39:0,39 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |"string"|
-Generated Location: (1436:46,0 [8] )
+Generated Location: (1289:38,0 [8] )
 |"string"|
 
 Source Location: (63:2,7 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     int x = 1;
 |
-Generated Location: (1683:57,0 [18] )
+Generated Location: (1536:49,0 [18] )
 |
     int x = 1;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
index 5c867e07a43..c73fd9449ad 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.codegen.cs
@@ -29,15 +29,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.CloseComponent();
             __builder.AddMarkupContent(1, "\r\n");
             __builder.OpenElement(2, "SomeComponent");
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.mappings.txt
index 152c2c30228..bba3a009bea 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_IgnoresStaticAndAliasUsings/TestComponent.mappings.txt
@@ -8,8 +8,3 @@ Source Location: (36:1,1 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (515:18,0 [17] )
 |using Foo = Test3|
 
-Source Location: (56:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1057:34,0 [11] )
-|MyComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
index 52991292787..ad0df196a80 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.codegen.cs
@@ -17,26 +17,10 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.CloseComponent();
             __builder.AddMarkupContent(1, "\r\n<mycomponent></mycomponent>\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(2);
+            __builder.OpenComponent<global::Test.MyComponent>(2);
             __builder.AddComponentParameter(3, nameof(global::Test.MyComponent.
 #nullable restore
 #line (3,14)-(3,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
index 9de2e581279..5b4cb92abc6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MatchingIsCaseSensitive/TestComponent.mappings.txt
@@ -1,30 +1,20 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (35:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1124:33,0 [11] )
-|MyComponent|
-
-Source Location: (47:2,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (47:2,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |intproperty|
-Generated Location: (1369:42,0 [11] )
+Generated Location: (1075:26,0 [11] )
 |IntProperty|
 
 Source Location: (60:2,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (1635:50,0 [1] )
+Generated Location: (1341:34,0 [1] )
 |1|
 
 Source Location: (63:2,29 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |BoolProperty|
-Generated Location: (1868:59,0 [12] )
+Generated Location: (1574:43,0 [12] )
 |BoolProperty|
 
 Source Location: (77:2,43 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |true|
-Generated Location: (2137:67,0 [4] )
+Generated Location: (1843:51,0 [4] )
 |true|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
index eb2645aac4b..10559c674e3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -45,15 +37,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             ));
             __builder.CloseComponent();
             __builder.AddMarkupContent(2, "\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-Mycomponent
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Test.Mycomponent>(3);
             __builder.AddComponentParameter(4, nameof(global::Test.Mycomponent.
 #nullable restore
 #line (2,14)-(2,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
index 2b01a17474c..7a1049b1e95 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_MultipleComponentsDifferByCase/TestComponent.mappings.txt
@@ -1,30 +1,20 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |IntProperty|
-Generated Location: (1031:31,0 [11] )
+Generated Location: (884:23,0 [11] )
 |IntProperty|
 
 Source Location: (26:0,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (1297:39,0 [1] )
+Generated Location: (1150:31,0 [1] )
 |1|
 
-Source Location: (34:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|Mycomponent|
-Generated Location: (1592:50,0 [11] )
-|Mycomponent|
-
 Source Location: (46:1,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |IntProperty|
-Generated Location: (1837:59,0 [11] )
+Generated Location: (1543:43,0 [11] )
 |IntProperty|
 
 Source Location: (59:1,26 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |2|
-Generated Location: (2103:67,0 [1] )
+Generated Location: (1809:51,0 [1] )
 |2|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
index ae593647d2c..70360436cf5 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.codegen.cs
@@ -36,15 +36,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::New.Test.
-#nullable restore
-#line (1,2)-(1,9) "x:\dir\subdir\Test\TestComponent.cshtml"
-Counter
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::New.Test.Counter>(0);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.mappings.txt
deleted file mode 100644
index ab23b956dd8..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_InImports/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-|Counter|
-Generated Location: (1171:41,0 [7] )
-|Counter|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
index 0cbedfdcc04..3ffe0b55b9b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.codegen.cs
@@ -36,15 +36,7 @@ public partial class Counter : global::Microsoft.AspNetCore.Components.Component
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::New.Test.
-#nullable restore
-#line (2,2)-(2,10) "x:\dir\subdir\Test\Pages/Counter.razor"
-Counter2
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::New.Test.Counter2>(0);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
index 40530fab98f..d297d378f91 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_NamespaceDirective_OverrideImports/Counter.mappings.txt
@@ -3,8 +3,3 @@
 Generated Location: (145:5,0 [8] )
 |New.Test|
 
-Source Location: (22:1,1 [8] x:\dir\subdir\Test\Pages/Counter.razor)
-|Counter2|
-Generated Location: (1170:41,0 [8] )
-|Counter2|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index e4fdda9d033..e4322ae577e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,9) "x:\dir\subdir\Test\TestComponent.cshtml"
-Counter
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.Counter>(0);
             __builder.CloseComponent();
 #nullable restore
 #line (2,2)-(4,5) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 5b2b2ad01fa..244c54efd3f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -1,13 +1,8 @@
-Source Location: (1:0,1 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-|Counter|
-Generated Location: (785:22,0 [7] )
-|Counter|
-
-Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (984:31,0 [18] )
+Generated Location: (838:23,0 [18] )
 |if (true)
 {
     |
@@ -16,7 +11,7 @@ Source Location: (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }
 |
-Generated Location: (1200:42,0 [5] )
+Generated Location: (1054:34,0 [5] )
 |
 }
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.codegen.cs
index cfe5a1a8d97..6b417eee018 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.codegen.cs
@@ -44,15 +44,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             __builder.AddAttribute(4, "TestCssScope");
             __builder.AddMarkupContent(5, "<child TestCssScope></child>\r\n    ");
             __builder.AddMarkupContent(6, "<child has multiple attributes=\"some with values\" TestCssScope>With text</child>\r\n    ");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,6)-(7,24) "x:\dir\subdir\Test\TestComponent.cshtml"
-TemplatedComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(7);
+            __builder.OpenComponent<global::Test.TemplatedComponent>(7);
             __builder.AddAttribute(8, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddMarkupContent(9, "<span id=\"hello\" TestCssScope>This is in child content</span>");
             }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.mappings.txt
index 56a3e84ab53..513c60ea68a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithCssScope/TestComponent.mappings.txt
@@ -13,39 +13,34 @@ Source Location: (192:3,61 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1332:37,0 [3] )
 |123|
 
-Source Location: (293:6,5 [18] x:\dir\subdir\Test\TestComponent.cshtml)
-|TemplatedComponent|
-Generated Location: (1813:49,0 [18] )
-|TemplatedComponent|
-
 Source Location: (318:6,30 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 |myComponentReference|
-Generated Location: (2333:62,0 [20] )
+Generated Location: (2186:54,0 [20] )
 |myComponentReference|
 
 Source Location: (439:10,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (DateTime.Now.Year > 1950)
 {
 |
-Generated Location: (2660:74,0 [34] )
+Generated Location: (2513:66,0 [34] )
 |if (DateTime.Now.Year > 1950)
 {
 |
 
 Source Location: (511:12,38 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |myElementReference|
-Generated Location: (3070:87,0 [18] )
+Generated Location: (2923:79,0 [18] )
 |myElementReference|
 
 Source Location: (589:13,30 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myVariable|
-Generated Location: (3731:104,0 [10] )
+Generated Location: (3584:96,0 [10] )
 |myVariable|
 
 Source Location: (639:14,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |}
 |
-Generated Location: (4225:116,0 [3] )
+Generated Location: (4078:108,0 [3] )
 |}
 |
 
@@ -60,7 +55,7 @@ Source Location: (651:16,7 [233] x:\dir\subdir\Test\TestComponent.cshtml)
         for (var i = 0; i < 10; i++)
         {
 |
-Generated Location: (4411:126,0 [233] )
+Generated Location: (4264:118,0 [233] )
 |
     ElementReference myElementReference;
     TemplatedComponent myComponentReference;
@@ -74,12 +69,12 @@ Generated Location: (4411:126,0 [233] )
 
 Source Location: (912:25,28 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |i|
-Generated Location: (4873:144,0 [1] )
+Generated Location: (4726:136,0 [1] )
 |i|
 
 Source Location: (925:25,41 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |i|
-Generated Location: (5152:154,25 [1] )
+Generated Location: (5005:146,25 [1] )
 |i|
 
 Source Location: (933:26,0 [164] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -90,7 +85,7 @@ Source Location: (933:26,0 [164] x:\dir\subdir\Test\TestComponent.cshtml)
         System.GC.KeepAlive(myVariable);
     }
 |
-Generated Location: (5334:163,0 [164] )
+Generated Location: (5187:155,0 [164] )
 |        }
 
         System.GC.KeepAlive(myElementReference);
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_NoValueSpecified/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_NoValueSpecified/TestComponent.codegen.cs
index fd81eb843a9..e7bd1eee7f6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_NoValueSpecified/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_NoValueSpecified/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,41) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredChildContent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredChildContent>(0);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_NoValueSpecified/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_NoValueSpecified/TestComponent.mappings.txt
deleted file mode 100644
index 5b72d6874a2..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_NoValueSpecified/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [39] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredChildContent|
-Generated Location: (786:22,0 [39] )
-|ComponentWithEditorRequiredChildContent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified/TestComponent.codegen.cs
index 177e2afc319..4889bc29ffd 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,41) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredChildContent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredChildContent>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddMarkupContent(2, "<h1>Hello World</h1>");
             }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified/TestComponent.mappings.txt
deleted file mode 100644
index 5b72d6874a2..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [39] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredChildContent|
-Generated Location: (786:22,0 [39] )
-|ComponentWithEditorRequiredChildContent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecifiedAsText_WithoutName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecifiedAsText_WithoutName/TestComponent.codegen.cs
index 77d36091403..187f2c57eaf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecifiedAsText_WithoutName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecifiedAsText_WithoutName/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,41) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredChildContent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredChildContent>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(2, "This is some text");
             }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecifiedAsText_WithoutName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecifiedAsText_WithoutName/TestComponent.mappings.txt
deleted file mode 100644
index 5b72d6874a2..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecifiedAsText_WithoutName/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [39] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredChildContent|
-Generated Location: (786:22,0 [39] )
-|ComponentWithEditorRequiredChildContent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified_WithoutName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified_WithoutName/TestComponent.codegen.cs
index 177e2afc319..4889bc29ffd 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified_WithoutName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified_WithoutName/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,41) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredChildContent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredChildContent>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddMarkupContent(2, "<h1>Hello World</h1>");
             }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified_WithoutName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified_WithoutName/TestComponent.mappings.txt
deleted file mode 100644
index 5b72d6874a2..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredChildContent_ValueSpecified_WithoutName/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [39] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredChildContent|
-Generated Location: (786:22,0 [39] )
-|ComponentWithEditorRequiredChildContent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_NoValueSpecified/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_NoValueSpecified/TestComponent.codegen.cs
index fd81eb843a9..e7bd1eee7f6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_NoValueSpecified/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_NoValueSpecified/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,41) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredChildContent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredChildContent>(0);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_NoValueSpecified/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_NoValueSpecified/TestComponent.mappings.txt
deleted file mode 100644
index 5b72d6874a2..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_NoValueSpecified/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [39] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredChildContent|
-Generated Location: (786:22,0 [39] )
-|ComponentWithEditorRequiredChildContent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_ValueSpecified/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_ValueSpecified/TestComponent.codegen.cs
index eb69a7d711e..4f0f1055be8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_ValueSpecified/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_ValueSpecified/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,41) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredChildContent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredChildContent>(0);
             __builder.AddAttribute(1, "Found", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddMarkupContent(2, "<h1>Here\'s Johnny!</h1>");
             }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_ValueSpecified/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_ValueSpecified/TestComponent.mappings.txt
deleted file mode 100644
index 5b72d6874a2..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredNamedChildContent_ValueSpecified/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [39] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredChildContent|
-Generated Location: (786:22,0 [39] )
-|ComponentWithEditorRequiredChildContent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_NoValueSpecified/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_NoValueSpecified/TestComponent.codegen.cs
index 5347e9d5a0a..08a7ffb21bf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_NoValueSpecified/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_NoValueSpecified/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,39) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredParameters
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredParameters>(0);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_NoValueSpecified/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_NoValueSpecified/TestComponent.mappings.txt
deleted file mode 100644
index 68dbe35c4cc..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_NoValueSpecified/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredParameters|
-Generated Location: (786:22,0 [37] )
-|ComponentWithEditorRequiredParameters|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecified/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecified/TestComponent.codegen.cs
index 0c8a7701898..e7117047bc7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecified/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecified/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,39) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredParameters
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredParameters>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.ComponentWithEditorRequiredParameters.
 #nullable restore
 #line (1,40)-(1,49) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecified/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecified/TestComponent.mappings.txt
index 08d9f36bdfc..15fec8d0b07 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecified/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecified/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredParameters|
-Generated Location: (786:22,0 [37] )
-|ComponentWithEditorRequiredParameters|
-
-Source Location: (39:0,39 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (39:0,39 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Property1|
-Generated Location: (1083:31,0 [9] )
+Generated Location: (936:23,0 [9] )
 |Property1|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecifiedUsingBind/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecifiedUsingBind/TestComponent.codegen.cs
index 068e0dd7b93..38362aa9632 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecifiedUsingBind/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecifiedUsingBind/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,39) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredParameters
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredParameters>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.ComponentWithEditorRequiredParameters.
 #nullable restore
 #line (1,46)-(1,55) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecifiedUsingBind/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecifiedUsingBind/TestComponent.mappings.txt
index ee6bea800e9..e51e016bdd3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecifiedUsingBind/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValueSpecifiedUsingBind/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredParameters|
-Generated Location: (786:22,0 [37] )
-|ComponentWithEditorRequiredParameters|
-
-Source Location: (45:0,45 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (45:0,45 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Property1|
-Generated Location: (1083:31,0 [9] )
+Generated Location: (936:23,0 [9] )
 |Property1|
 
 Source Location: (56:0,56 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |myField|
-Generated Location: (1348:39,0 [7] )
+Generated Location: (1201:31,0 [7] )
 |myField|
 
 Source Location: (78:2,7 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string myField = "Some Value";
 |
-Generated Location: (1809:51,0 [46] )
+Generated Location: (1662:43,0 [46] )
 |
     private string myField = "Some Value";
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValuesSpecifiedUsingSplatting/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValuesSpecifiedUsingSplatting/TestComponent.codegen.cs
index 72d64f9d035..359996b0621 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValuesSpecifiedUsingSplatting/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValuesSpecifiedUsingSplatting/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,39) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithEditorRequiredParameters
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithEditorRequiredParameters>(0);
             __builder.AddMultipleAttributes(1, global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
 #line (1,55)-(1,87) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValuesSpecifiedUsingSplatting/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValuesSpecifiedUsingSplatting/TestComponent.mappings.txt
index 7bb11183e54..2cf7ca3909b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValuesSpecifiedUsingSplatting/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEditorRequiredParameter_ValuesSpecifiedUsingSplatting/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [37] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithEditorRequiredParameters|
-Generated Location: (786:22,0 [37] )
-|ComponentWithEditorRequiredParameters|
-
-Source Location: (54:0,54 [32] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (54:0,54 [32] x:\dir\subdir\Test\TestComponent.cshtml)
 |new Dictionary<string, object>()|
-Generated Location: (1220:31,0 [32] )
+Generated Location: (1073:23,0 [32] )
 |new Dictionary<string, object>()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEscapedParameterName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEscapedParameterName/TestComponent.codegen.cs
index 26530897341..f52672116a7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEscapedParameterName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEscapedParameterName/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,19) 1 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEscapedParameterName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEscapedParameterName/TestComponent.mappings.txt
index 61aaa5bf321..dce07277ced 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEscapedParameterName/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithEscapedParameterName/TestComponent.mappings.txt
@@ -1,25 +1,20 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |class|
-Generated Location: (1034:31,1 [5] )
+Generated Location: (887:23,1 [5] )
 |class|
 
 Source Location: (20:0,20 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (1294:39,0 [1] )
+Generated Location: (1147:31,0 [1] )
 |1|
 
 Source Location: (23:0,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Prop2|
-Generated Location: (1527:48,0 [5] )
+Generated Location: (1380:40,0 [5] )
 |Prop2|
 
 Source Location: (30:0,30 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |2|
-Generated Location: (1787:56,0 [1] )
+Generated Location: (1640:48,0 [1] )
 |2|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
index 6668579e3f6..2607acf78b1 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.codegen.cs
@@ -17,37 +17,13 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.CloseComponent();
             __builder.AddMarkupContent(1, "\r\n");
-            __builder.OpenComponent<global::
-#nullable restore
-#line (2,2)-(2,18) "x:\dir\subdir\Test\TestComponent.cshtml"
-Test.MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(2);
+            __builder.OpenComponent<global::Test.MyComponent>(2);
             __builder.CloseComponent();
             __builder.AddMarkupContent(3, "\r\n");
-            __builder.OpenComponent<global::
-#nullable restore
-#line (3,2)-(3,20) "x:\dir\subdir\Test\TestComponent.cshtml"
-Test2.MyComponent2
-
-#line default
-#line hidden
-#nullable disable
-            >(4);
+            __builder.OpenComponent<global::Test2.MyComponent2>(4);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.mappings.txt
deleted file mode 100644
index cb6380c6404..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithFullyQualifiedTagNames/TestComponent.mappings.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (18:1,1 [16] x:\dir\subdir\Test\TestComponent.cshtml)
-|Test.MyComponent|
-Generated Location: (1088:33,0 [16] )
-|Test.MyComponent|
-
-Source Location: (40:2,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
-|Test2.MyComponent2|
-Generated Location: (1395:44,0 [18] )
-|Test2.MyComponent2|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
index 526f60ef8be..4c014da3f33 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "@onclick", "() => Increment()");
             __builder.CloseComponent();
         }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
index 1548824b84a..0076986efef 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImplicitLambdaEventHandler/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (54:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
     private void Increment() {
         counter++;
     }
 |
-Generated Location: (1120:34,0 [87] )
+Generated Location: (973:26,0 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
index a14cb2d2f20..159db3439c5 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.codegen.cs
@@ -37,15 +37,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,9) "x:\dir\subdir\Test\TestComponent.cshtml"
-Counter
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.Counter>(0);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.mappings.txt
deleted file mode 100644
index 915a9f6147b..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithImportsFile/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-|Counter|
-Generated Location: (1179:42,0 [7] )
-|Counter|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithInitOnlyParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithInitOnlyParameter/TestComponent.codegen.cs
index a63aa8b5809..034146680a6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithInitOnlyParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithInitOnlyParameter/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithInitOnlyParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithInitOnlyParameter/TestComponent.mappings.txt
index 90787ce9727..3dd1f28e91a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithInitOnlyParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithInitOnlyParameter/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Prop|
-Generated Location: (1031:31,0 [4] )
+Generated Location: (884:23,0 [4] )
 |Prop|
 
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (1290:39,0 [1] )
+Generated Location: (1143:31,0 [1] )
 |1|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
index a8270002297..a360dba6ec3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "ParamBefore", "before");
             __builder.AddComponentParameter(2, "ParamAfter", "after");
             __builder.SetKey(
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
index c7ba0f7abab..9422bff7e9d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (40:0,40 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |someDate.Day|
-Generated Location: (1127:33,0 [12] )
+Generated Location: (980:25,0 [12] )
 |someDate.Day|
 
 Source Location: (86:2,7 [49] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private DateTime someDate = DateTime.Now;
 |
-Generated Location: (1379:45,0 [49] )
+Generated Location: (1232:37,0 [49] )
 |
     private DateTime someDate = DateTime.Now;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
index 11c4c3ca4c3..3ccc151342e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "SomeProp", "val");
             __builder.AddAttribute(2, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddMarkupContent(3, "\r\n    Some ");
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
index 76a5ec9b938..1ae220ae4b8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithKey_WithChildContent/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |123 + 456|
-Generated Location: (1358:37,0 [9] )
+Generated Location: (1211:29,0 [9] )
 |123 + 456|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
index 3ac1e637f93..e982a1e72b7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.codegen.cs
@@ -30,15 +30,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (4,2)-(4,17) "x:\dir\subdir\Test\TestComponent.cshtml"
-HeaderComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.HeaderComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.HeaderComponent.
 #nullable restore
 #line (4,18)-(4,24) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -50,15 +42,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             ), "head");
             __builder.CloseComponent();
             __builder.AddMarkupContent(2, "\r\n");
-            __builder.OpenComponent<global::AnotherTest.
-#nullable restore
-#line (6,2)-(6,17) "x:\dir\subdir\Test\TestComponent.cshtml"
-FooterComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::AnotherTest.FooterComponent>(3);
             __builder.AddComponentParameter(4, nameof(global::AnotherTest.FooterComponent.
 #nullable restore
 #line (6,18)-(6,24) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
index 3919c617fd5..cb4951e79a2 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNamespaceDirective/TestComponent.mappings.txt
@@ -8,23 +8,13 @@ Source Location: (1:0,1 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (513:19,0 [10] )
 |using Test|
 
-Source Location: (40:3,1 [15] x:\dir\subdir\Test\TestComponent.cshtml)
-|HeaderComponent|
-Generated Location: (1048:35,0 [15] )
-|HeaderComponent|
-
 Source Location: (56:3,17 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Header|
-Generated Location: (1301:44,0 [6] )
+Generated Location: (1154:36,0 [6] )
 |Header|
 
-Source Location: (93:5,1 [15] x:\dir\subdir\Test\TestComponent.cshtml)
-|FooterComponent|
-Generated Location: (1616:55,0 [15] )
-|FooterComponent|
-
 Source Location: (109:5,17 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Footer|
-Generated Location: (1876:64,0 [6] )
+Generated Location: (1582:48,0 [6] )
 |Footer|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableActionParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableActionParameter/TestComponent.codegen.cs
index 88c35b3c490..acadee39e3c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableActionParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableActionParameter/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,29) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithNullableAction
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithNullableAction>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.ComponentWithNullableAction.
 #nullable restore
 #line (1,30)-(1,44) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableActionParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableActionParameter/TestComponent.mappings.txt
index 02478ba0f53..a09bb965918 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableActionParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableActionParameter/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [27] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithNullableAction|
-Generated Location: (786:22,0 [27] )
-|ComponentWithNullableAction|
-
-Source Location: (29:0,29 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (29:0,29 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |NullableAction|
-Generated Location: (1063:31,0 [14] )
+Generated Location: (916:23,0 [14] )
 |NullableAction|
 
 Source Location: (46:0,46 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |NullableAction|
-Generated Location: (1252:39,0 [14] )
+Generated Location: (1105:31,0 [14] )
 |NullableAction|
 
 Source Location: (73:1,7 [61] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +13,7 @@ Source Location: (73:1,7 [61] x:\dir\subdir\Test\TestComponent.cshtml)
 	[Parameter]
 	public Action NullableAction { get; set; }
 |
-Generated Location: (1505:50,0 [61] )
+Generated Location: (1358:42,0 [61] )
 |
 	[Parameter]
 	public Action NullableAction { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableRenderFragmentParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableRenderFragmentParameter/TestComponent.codegen.cs
index e7d7394e23b..4d44d3a52e2 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableRenderFragmentParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableRenderFragmentParameter/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,37) "x:\dir\subdir\Test\TestComponent.cshtml"
-ComponentWithNullableRenderFragment
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.ComponentWithNullableRenderFragment>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.ComponentWithNullableRenderFragment.
 #nullable restore
 #line (1,38)-(1,44) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableRenderFragmentParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableRenderFragmentParameter/TestComponent.mappings.txt
index 117ac5ff5a1..3063c1dff0d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableRenderFragmentParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithNullableRenderFragmentParameter/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [35] x:\dir\subdir\Test\TestComponent.cshtml)
-|ComponentWithNullableRenderFragment|
-Generated Location: (786:22,0 [35] )
-|ComponentWithNullableRenderFragment|
-
-Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:0,37 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Header|
-Generated Location: (1079:31,0 [6] )
+Generated Location: (932:23,0 [6] )
 |Header|
 
 Source Location: (46:0,46 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Header|
-Generated Location: (1293:39,0 [6] )
+Generated Location: (1146:31,0 [6] )
 |Header|
 
 Source Location: (65:1,7 [59] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 	[Parameter] public RenderFragment Header { get; set; }
 |
-Generated Location: (1538:50,0 [59] )
+Generated Location: (1391:42,0 [59] )
 |
 	[Parameter] public RenderFragment Header { get; set; }
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
index 13e5c023d0c..88d552cbdc5 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "ParamBefore", "before");
             __builder.AddComponentParameter(2, "ParamAfter", "after");
             __builder.AddComponentReferenceCapture(3, (__value) => {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
index 6c7670d2184..3100cc31eec 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef/TestComponent.mappings.txt
@@ -1,11 +1,6 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (40:0,40 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1166:33,0 [10] )
+Generated Location: (1019:25,0 [10] )
 |myInstance|
 
 Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +8,7 @@ Source Location: (84:2,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1484:46,0 [104] )
+Generated Location: (1337:38,0 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable/TestComponent.codegen.cs
index 21635526f0f..c8039203567 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             __builder.AddComponentReferenceCapture(1, (__value) => {
 #nullable restore
 #line (1,22)-(1,33) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable/TestComponent.mappings.txt
index 00c4740f1b4..45b8654223c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable/TestComponent.mappings.txt
@@ -1,11 +1,6 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (21:0,21 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |myComponent|
-Generated Location: (1022:31,0 [11] )
+Generated Location: (875:23,0 [11] )
 |myComponent|
 
 Source Location: (47:2,7 [111] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +8,7 @@ Source Location: (47:2,7 [111] x:\dir\subdir\Test\TestComponent.cshtml)
     private TestComponent myComponent = null!;
     public void Use() { System.GC.KeepAlive(myComponent); }
 |
-Generated Location: (1343:44,0 [111] )
+Generated Location: (1196:36,0 [111] )
 |
     private TestComponent myComponent = null!;
     public void Use() { System.GC.KeepAlive(myComponent); }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable_Generic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable_Generic/TestComponent.codegen.cs
index d9e0925b82f..62f0b3a0062 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable_Generic/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable_Generic/TestComponent.codegen.cs
@@ -57,15 +57,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Action<global::Test.MyComponent<T>> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (1,33)-(1,44) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable_Generic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable_Generic/TestComponent.mappings.txt
index 951a4e004d6..b9847f8c6aa 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable_Generic/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_Nullable_Generic/TestComponent.mappings.txt
@@ -19,13 +19,8 @@ Generated Location: (1257:42,0 [114] )
     public void Use() { System.GC.KeepAlive(myComponent); }
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1912:62,0 [11] )
-|MyComponent|
-
 Source Location: (32:0,32 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyParameter|
-Generated Location: (2162:71,0 [11] )
+Generated Location: (2019:63,0 [11] )
 |MyParameter|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
index ed155df3c23..cf50a2c5e91 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "SomeProp", "val");
             __builder.AddAttribute(2, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddMarkupContent(3, "\r\n    Some ");
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
index 29858eb92e0..38255405803 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithRef_WithChildContent/TestComponent.mappings.txt
@@ -1,11 +1,6 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |myInstance|
-Generated Location: (1397:37,0 [10] )
+Generated Location: (1250:29,0 [10] )
 |myInstance|
 
 Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +8,7 @@ Source Location: (108:4,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
 |
-Generated Location: (1715:50,0 [104] )
+Generated Location: (1568:42,0 [104] )
 |
     private Test.MyComponent myInstance;
     public void Foo() { System.GC.KeepAlive(myInstance); }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
index 4dd1b95fd71..d6742b95986 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "AttributeBefore", "before");
             __builder.AddMultipleAttributes(2, global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
index bbfb67e19e7..2f70475da93 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (51:0,51 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1272:32,0 [14] )
+Generated Location: (1125:24,0 [14] )
 |someAttributes|
 
 Source Location: (103:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1601:44,0 [93] )
+Generated Location: (1454:36,0 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
index 88427342605..df3e280aac8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "AttributeBefore", "before");
             __builder.AddMultipleAttributes(2, global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
index 6febf4c1984..cf669038d3e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ExplicitExpression/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (53:0,53 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1272:32,0 [14] )
+Generated Location: (1125:24,0 [14] )
 |someAttributes|
 
 Source Location: (106:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1601:44,0 [93] )
+Generated Location: (1454:36,0 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
index d0ea5210163..58561d050be 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.codegen.cs
@@ -54,15 +54,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0, int __seq1, global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (1,14)-(1,19) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
index 3ddc12a2e17..3bd696a8af1 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_GenericTypeInference/TestComponent.mappings.txt
@@ -17,13 +17,8 @@ Generated Location: (1203:40,0 [93] )
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1898:59,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2148:68,0 [5] )
+Generated Location: (2005:60,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
index 78cb0a27cf1..c56a6883bcf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "AttributeBefore", "before");
             __builder.AddMultipleAttributes(2, global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::System.Collections.Generic.IEnumerable<global::System.Collections.Generic.KeyValuePair<string, object>>>(
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
index b7fe51dafee..ba7912a32c6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithSplat_ImplicitExpression/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (52:0,52 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |someAttributes|
-Generated Location: (1272:32,0 [14] )
+Generated Location: (1125:24,0 [14] )
 |someAttributes|
 
 Source Location: (104:2,7 [93] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
-Generated Location: (1601:44,0 [93] )
+Generated Location: (1454:36,0 [93] )
 |
     private Dictionary<string, object> someAttributes = new Dictionary<string, object>();
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
index f24199b381b..e745d727f2c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.codegen.cs
@@ -43,26 +43,10 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (4,2)-(4,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.CloseComponent();
             __builder.AddMarkupContent(1, "\r\n");
-            __builder.OpenComponent<global::Test2.
-#nullable restore
-#line (5,2)-(5,14) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent2
-
-#line default
-#line hidden
-#nullable disable
-            >(2);
+            __builder.OpenComponent<global::Test2.MyComponent2>(2);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
index 2ea1a6a230c..41b92897113 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives/TestComponent.mappings.txt
@@ -13,13 +13,3 @@ Source Location: (23:1,6 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (871:32,0 [20] )
 |"/AnotherRoute/{id}"|
 
-Source Location: (60:3,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1409:48,0 [11] )
-|MyComponent|
-
-Source Location: (77:4,1 [12] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent2|
-Generated Location: (1717:59,0 [12] )
-|MyComponent2|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
index 96231c0c4a4..d3fd37f56d9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.codegen.cs
@@ -29,15 +29,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.CloseComponent();
             __builder.AddMarkupContent(1, "\r\n");
         }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.mappings.txt
index deebc861cf6..ef93efe911a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithUsingDirectives_AmbiguousImport/TestComponent.mappings.txt
@@ -8,8 +8,3 @@ Source Location: (15:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (494:18,0 [11] )
 |using Test3|
 
-Source Location: (29:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1030:34,0 [11] )
-|MyComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithWriteOnlyParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithWriteOnlyParameter/TestComponent.codegen.cs
index a63aa8b5809..034146680a6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithWriteOnlyParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithWriteOnlyParameter/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithWriteOnlyParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithWriteOnlyParameter/TestComponent.mappings.txt
index 90787ce9727..3dd1f28e91a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithWriteOnlyParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithWriteOnlyParameter/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Prop|
-Generated Location: (1031:31,0 [4] )
+Generated Location: (884:23,0 [4] )
 |Prop|
 
 Source Location: (19:0,19 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |1|
-Generated Location: (1290:39,0 [1] )
+Generated Location: (1143:31,0 [1] )
 |1|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
index 75efb1c947d..b3e3fafff38 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.mappings.txt
index 178a9d6ead7..aee5de94f20 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Message|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |Message|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
index b4e507ee702..d92a7cd12b6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
index 66c2b8d131a..d1ca801dd40 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessage/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Message|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |Message|
 
 Source Location: (23:0,23 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1294:39,0 [7] )
+Generated Location: (1147:31,0 [7] )
 |message|
 
 Source Location: (38:0,38 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Message|
-Generated Location: (1533:48,0 [7] )
+Generated Location: (1386:40,0 [7] )
 |Message|
 
 Source Location: (48:0,48 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1796:56,0 [7] )
+Generated Location: (1649:48,0 [7] )
 |message|
 
 Source Location: (73:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2836:69,0 [30] )
+Generated Location: (2689:61,0 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
index 6e37d734454..2b1d46948bf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
index a8a0f9f6b03..3fb5998d483 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageChanged/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |MessageChanged|
-Generated Location: (1031:31,0 [14] )
+Generated Location: (884:23,0 [14] )
 |MessageChanged|
 
 Source Location: (31:0,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1454:39,0 [9] )
+Generated Location: (1307:31,0 [9] )
 |(s) => {}|
 
 Source Location: (49:0,49 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Message|
-Generated Location: (1696:48,0 [7] )
+Generated Location: (1549:40,0 [7] )
 |Message|
 
 Source Location: (59:0,59 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1959:56,0 [7] )
+Generated Location: (1812:48,0 [7] )
 |message|
 
 Source Location: (84:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2999:69,0 [30] )
+Generated Location: (2852:61,0 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
index e0c5ca6b889..de3f01d6ce7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,39)-(1,56) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
index dc8f0dc6e23..5587b5952ad 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_BindMessageExpression/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (38:0,38 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (38:0,38 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 |MessageExpression|
-Generated Location: (1031:31,0 [17] )
+Generated Location: (884:23,0 [17] )
 |MessageExpression|
 
 Source Location: (59:0,59 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |(s) => {}|
-Generated Location: (1371:39,0 [9] )
+Generated Location: (1224:31,0 [9] )
 |(s) => {}|
 
 Source Location: (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Message|
-Generated Location: (1612:48,0 [7] )
+Generated Location: (1465:40,0 [7] )
 |Message|
 
 Source Location: (29:0,29 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |message|
-Generated Location: (1875:56,0 [7] )
+Generated Location: (1728:48,0 [7] )
 |message|
 
 Source Location: (87:1,12 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string message = "hi";
 |
-Generated Location: (2915:69,0 [30] )
+Generated Location: (2768:61,0 [30] )
 |
     string message = "hi";
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
index 2a974bbf264..34d87a31a3a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.mappings.txt
index 178a9d6ead7..aee5de94f20 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_Multiple/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |Message|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |Message|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
index 697641bb175..991a788bd4b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "Foo", "test");
             __builder.AddComponentParameter(2, "foo", "test");
             __builder.CloseComponent();
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.mappings.txt
deleted file mode 100644
index 2d715cab12f..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateComponentParameters_IsAnError_WeaklyTyped/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Duplicate_RenderMode/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Duplicate_RenderMode/TestComponent.codegen.cs
index 4c843655b79..cd1ded73754 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Duplicate_RenderMode/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Duplicate_RenderMode/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode = 
 #nullable restore
 #line (1,29)-(1,93) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Duplicate_RenderMode/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Duplicate_RenderMode/TestComponent.mappings.txt
index fe354caf298..93432e31893 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Duplicate_RenderMode/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Duplicate_RenderMode/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (28:0,28 [64] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (1042:31,0 [64] )
+Generated Location: (895:23,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EmptyRootNamespace/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EmptyRootNamespace/TestComponent.codegen.cs
index 694708c9d55..f5b2f59cde3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EmptyRootNamespace/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EmptyRootNamespace/TestComponent.codegen.cs
@@ -17,26 +17,10 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddMarkupContent(0, "<h1>Generated</h1>\r\n");
-            __builder.OpenComponent<global::
-#nullable restore
-#line (2,2)-(2,12) "x:\dir\subdir\Test\TestComponent.cshtml"
-Component1
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::Component1>(1);
             __builder.CloseComponent();
             __builder.AddMarkupContent(2, "\r\n");
-            __builder.OpenComponent<global::
-#nullable restore
-#line (3,2)-(3,19) "x:\dir\subdir\Test\TestComponent.cshtml"
-Shared.Component2
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Shared.Component2>(3);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EmptyRootNamespace/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EmptyRootNamespace/TestComponent.mappings.txt
deleted file mode 100644
index b35d358a341..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EmptyRootNamespace/TestComponent.mappings.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Source Location: (21:1,1 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|Component1|
-Generated Location: (834:22,0 [10] )
-|Component1|
-
-Source Location: (37:2,1 [17] x:\dir\subdir\Test\TestComponent.cshtml)
-|Shared.Component2|
-Generated Location: (1135:33,0 [17] )
-|Shared.Component2|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_Array/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_Array/TestComponent.codegen.cs
index 11e65548fc7..dbc6965ff06 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_Array/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_Array/TestComponent.codegen.cs
@@ -46,15 +46,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem[] __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem[]> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<TItem[]>> __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,20)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_Array/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_Array/TestComponent.mappings.txt
index 1d00df62379..f85ca7aa75c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_Array/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_Array/TestComponent.mappings.txt
@@ -12,13 +12,8 @@ Generated Location: (1288:32,0 [64] )
     string[] Selected { get; set; } = Array.Empty<string>();
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2008:51,0 [11] )
-|MyComponent|
-
 Source Location: (19:0,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2266:60,0 [5] )
+Generated Location: (2123:52,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType/TestComponent.codegen.cs
index 9389db71f4f..42a3338cc3e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,17)-(1,23) "x:\dir\subdir\Test\TestComponent.cshtml"
 MyType
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType/TestComponent.mappings.txt
index 95df3bd0d10..6d62119024d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType/TestComponent.mappings.txt
@@ -1,28 +1,23 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (16:0,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (16:0,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyType|
-Generated Location: (946:30,0 [6] )
+Generated Location: (799:22,0 [6] )
 |MyType|
 
 Source Location: (24:0,24 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1195:39,0 [7] )
+Generated Location: (1048:31,0 [7] )
 |OnClick|
 
 Source Location: (35:0,35 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 |(MyType arg) => counter++|
-Generated Location: (1581:47,0 [25] )
+Generated Location: (1434:39,0 [25] )
 |(MyType arg) => counter++|
 
 Source Location: (75:2,7 [28] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private int counter;
 |
-Generated Location: (1846:58,0 [28] )
+Generated Location: (1699:50,0 [28] )
 |
     private int counter;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType_MethodGroup/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType_MethodGroup/TestComponent.codegen.cs
index e4de1bee600..f5929e97864 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType_MethodGroup/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType_MethodGroup/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,17)-(1,23) "x:\dir\subdir\Test\TestComponent.cshtml"
 MyType
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType_MethodGroup/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType_MethodGroup/TestComponent.mappings.txt
index e29aae26d6f..15d22296209 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType_MethodGroup/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_ExplicitType_MethodGroup/TestComponent.mappings.txt
@@ -1,21 +1,16 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (16:0,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (16:0,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyType|
-Generated Location: (946:30,0 [6] )
+Generated Location: (799:22,0 [6] )
 |MyType|
 
 Source Location: (24:0,24 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1195:39,0 [7] )
+Generated Location: (1048:31,0 [7] )
 |OnClick|
 
 Source Location: (33:0,33 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1581:47,0 [9] )
+Generated Location: (1434:39,0 [9] )
 |Increment|
 
 Source Location: (56:2,7 [84] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -24,7 +19,7 @@ Source Location: (56:2,7 [84] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public void Increment(MyType type) => counter++;
 |
-Generated Location: (1830:58,0 [84] )
+Generated Location: (1683:50,0 [84] )
 |
     private int counter;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_01/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_01/TestComponent.codegen.cs
index 3e5a427d73a..6e5349b3392 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_01/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_01/TestComponent.codegen.cs
@@ -37,15 +37,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T, T2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::Microsoft.AspNetCore.Components.EventCallback<T> __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T, object>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T, object>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<T, object>.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_01/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_01/TestComponent.mappings.txt
index 2dbcfc7a12c..d2985a41102 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_01/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_01/TestComponent.mappings.txt
@@ -7,13 +7,8 @@ Generated Location: (783:23,0 [28] )
     private int counter;
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1340:42,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1606:51,0 [7] )
+Generated Location: (1463:43,0 [7] )
 |OnClick|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_02/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_02/TestComponent.codegen.cs
index c1e4070fdf8..7496b00ee2c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_02/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_02/TestComponent.codegen.cs
@@ -37,15 +37,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T, T2>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Object __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <object, object>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<object, object>>(seq);
         __builder.AddComponentParameter(__seq0, "OnClick", __arg0);
         __builder.CloseComponent();
         }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_02/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_02/TestComponent.mappings.txt
index 52eb58a6ae3..7e5e43de5a9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_02/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallbackOfT_GenericComponent_MissingTypeParameterBinding_02/TestComponent.mappings.txt
@@ -7,8 +7,3 @@ Generated Location: (783:23,0 [28] )
     private int counter;
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1305:42,0 [11] )
-|MyComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
index a71918e1310..8c3797450c4 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.codegen.cs
@@ -23,15 +23,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,14)-(2,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
index 1108932e571..2be87acfaf0 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Explicitly/TestComponent.mappings.txt
@@ -3,19 +3,14 @@
 Generated Location: (372:12,0 [41] )
 |using Microsoft.AspNetCore.Components.Web|
 
-Source Location: (45:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (938:28,0 [11] )
-|MyComponent|
-
 Source Location: (57:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1183:37,0 [7] )
+Generated Location: (1036:29,0 [7] )
 |OnClick|
 
 Source Location: (68:1,24 [61] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create<MouseEventArgs>(this, Increment)|
-Generated Location: (1673:45,0 [61] )
+Generated Location: (1526:37,0 [61] )
 |EventCallback.Factory.Create<MouseEventArgs>(this, Increment)|
 
 Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -25,7 +20,7 @@ Source Location: (144:3,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1974:56,0 [87] )
+Generated Location: (1827:48,0 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
index 3279a505988..0dac935c525 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
index 970cd4f31f1..9bfc98acdcf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_Action/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |OnClick|
 
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1521:39,0 [9] )
+Generated Location: (1374:31,0 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +15,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1770:50,0 [87] )
+Generated Location: (1623:42,0 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
index 0822ed13ba9..5bb28083dbf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.codegen.cs
@@ -23,15 +23,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,14)-(2,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
index 3723ecbd098..c9eec819a28 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_ActionOfT/TestComponent.mappings.txt
@@ -3,19 +3,14 @@
 Generated Location: (372:12,0 [41] )
 |using Microsoft.AspNetCore.Components.Web|
 
-Source Location: (45:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (938:28,0 [11] )
-|MyComponent|
-
 Source Location: (57:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1183:37,0 [7] )
+Generated Location: (1036:29,0 [7] )
 |OnClick|
 
 Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1673:45,0 [9] )
+Generated Location: (1526:37,0 [9] )
 |Increment|
 
 Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -25,7 +20,7 @@ Source Location: (90:3,7 [103] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1922:56,0 [103] )
+Generated Location: (1775:48,0 [103] )
 |
     private int counter;
     private void Increment(MouseEventArgs e) {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
index f39e9d8ebae..3a458c13975 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.codegen.cs
@@ -23,15 +23,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,14)-(2,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
index 61a538fc666..8d6ae294b6b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTTask/TestComponent.mappings.txt
@@ -3,19 +3,14 @@
 Generated Location: (372:12,0 [41] )
 |using Microsoft.AspNetCore.Components.Web|
 
-Source Location: (45:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (938:28,0 [11] )
-|MyComponent|
-
 Source Location: (57:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1183:37,0 [7] )
+Generated Location: (1036:29,0 [7] )
 |OnClick|
 
 Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1673:45,0 [9] )
+Generated Location: (1526:37,0 [9] )
 |Increment|
 
 Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -26,7 +21,7 @@ Source Location: (90:3,7 [139] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1923:56,0 [139] )
+Generated Location: (1776:48,0 [139] )
 |
     private int counter;
     private Task Increment(MouseEventArgs e) {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
index 96148916d15..4ee4be91234 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
index a2092a251fa..7108b3258d7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |OnClick|
 
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1521:39,0 [9] )
+Generated Location: (1374:31,0 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -21,7 +16,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1770:50,0 [123] )
+Generated Location: (1623:42,0 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
index 4f65fcc358b..08d787ac69d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.codegen.cs
@@ -23,15 +23,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,14)-(2,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
index c412b32b70b..21307e42d2b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallbackOfT_Implicitly_TypeMismatch/TestComponent.mappings.txt
@@ -3,19 +3,14 @@
 Generated Location: (372:12,0 [41] )
 |using Microsoft.AspNetCore.Components.Web|
 
-Source Location: (45:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (938:28,0 [11] )
-|MyComponent|
-
 Source Location: (57:1,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1183:37,0 [7] )
+Generated Location: (1036:29,0 [7] )
 |OnClick|
 
 Source Location: (67:1,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1673:45,0 [9] )
+Generated Location: (1526:37,0 [9] )
 |Increment|
 
 Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -25,7 +20,7 @@ Source Location: (90:3,7 [104] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1922:56,0 [104] )
+Generated Location: (1775:48,0 [104] )
 |
     private int counter;
     private void Increment(ChangeEventArgs e) {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
index 96cbbfda1de..febdfe3ea1b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
index ea19333af05..cafda797e6a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Explicitly/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |OnClick|
 
 Source Location: (24:0,24 [45] x:\dir\subdir\Test\TestComponent.cshtml)
 |EventCallback.Factory.Create(this, Increment)|
-Generated Location: (1401:39,0 [45] )
+Generated Location: (1254:31,0 [45] )
 |EventCallback.Factory.Create(this, Increment)|
 
 Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +15,7 @@ Source Location: (84:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1686:50,0 [87] )
+Generated Location: (1539:42,0 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
index 1686282949e..42ecee966bc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
index c19fbc146cc..4d3475d6d60 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_Action/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |OnClick|
 
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1401:39,0 [9] )
+Generated Location: (1254:31,0 [9] )
 |Increment|
 
 Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +15,7 @@ Source Location: (46:2,7 [87] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1650:50,0 [87] )
+Generated Location: (1503:42,0 [87] )
 |
     private int counter;
     private void Increment() {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
index c3be6197cc0..7fe6c481a4e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
index 86db01332dd..f9a8b09c611 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_ActionOfObject/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |OnClick|
 
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1401:39,0 [9] )
+Generated Location: (1254:31,0 [9] )
 |Increment|
 
 Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -20,7 +15,7 @@ Source Location: (46:2,7 [95] x:\dir\subdir\Test\TestComponent.cshtml)
         counter++;
     }
 |
-Generated Location: (1650:50,0 [95] )
+Generated Location: (1503:42,0 [95] )
 |
     private int counter;
     private void Increment(object e) {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
index ac2644662d2..c5318e1ac23 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
index 4c2a213f199..9a1fbff6cf0 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfTask/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |OnClick|
 
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1401:39,0 [9] )
+Generated Location: (1254:31,0 [9] )
 |Increment|
 
 Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -21,7 +16,7 @@ Source Location: (46:2,7 [123] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1650:50,0 [123] )
+Generated Location: (1503:42,0 [123] )
 |
     private int counter;
     private Task Increment() {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
index c979f2ff6a2..eff63cf8b8b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,21) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
index f1112361f83..81c6fcdabc9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventCallback_CanPassEventCallback_Implicitly_FuncOfobjectTask/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |OnClick|
-Generated Location: (1031:31,0 [7] )
+Generated Location: (884:23,0 [7] )
 |OnClick|
 
 Source Location: (23:0,23 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Increment|
-Generated Location: (1401:39,0 [9] )
+Generated Location: (1254:31,0 [9] )
 |Increment|
 
 Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -21,7 +16,7 @@ Source Location: (46:2,7 [131] x:\dir\subdir\Test\TestComponent.cshtml)
         return Task.CompletedTask;
     }
 |
-Generated Location: (1650:50,0 [131] )
+Generated Location: (1503:42,0 [131] )
 |
     private int counter;
     private Task Increment(object e) {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.codegen.cs
index 76a55f63eaf..f3fd8bdd481 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.codegen.cs
@@ -23,15 +23,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             __builder.AddComponentParameter(1, "method", "post");
             __builder.AddComponentParameter(2, "onsubmit", global::Microsoft.AspNetCore.Components.EventCallback.Factory.Create<global::System.EventArgs>(this, 
 #nullable restore
@@ -45,15 +37,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             __builder.AddComponentParameter(3, "@formname", "named-form-handler");
             __builder.CloseComponent();
             __builder.AddMarkupContent(4, "\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(5);
+            __builder.OpenComponent<global::Test.TestComponent>(5);
             __builder.AddComponentParameter(6, "method", "post");
             __builder.AddComponentParameter(7, "onsubmit", global::Microsoft.AspNetCore.Components.EventCallback.Factory.Create<global::System.EventArgs>(this, 
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.mappings.txt
index 1ccc7b93d4a..83be993fd5e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component/TestComponent.mappings.txt
@@ -3,28 +3,18 @@
 Generated Location: (372:12,0 [41] )
 |using Microsoft.AspNetCore.Components.Web|
 
-Source Location: (45:1,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (938:28,0 [13] )
-|TestComponent|
-
 Source Location: (84:1,40 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (1333:38,0 [9] )
+Generated Location: (1186:30,0 [9] )
 |() => { }|
 
-Source Location: (131:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1720:50,0 [13] )
-|TestComponent|
-
 Source Location: (170:2,40 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (2115:60,0 [9] )
+Generated Location: (1821:44,0 [9] )
 |() => { }|
 
 Source Location: (194:2,64 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 |"named-form-handler"|
-Generated Location: (2337:69,0 [20] )
+Generated Location: (2043:53,0 [20] )
 |"named-form-handler"|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.codegen.cs
index 6531c23a066..bdaec4406f0 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.codegen.cs
@@ -94,15 +94,7 @@ internal static class TypeInference
     {
         public static void CreateTestComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Object __arg0, int __seq1, global::System.Object __arg1, int __seq2, global::System.Object __arg2, int __seq3, T __arg3)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, "method", __arg0);
         __builder.AddComponentParameter(__seq1, "onsubmit", __arg1);
         __builder.AddComponentParameter(__seq2, "@formname", __arg2);
@@ -119,15 +111,7 @@ public static void CreateTestComponent_0<T>(global::Microsoft.AspNetCore.Compone
         }
         public static void CreateTestComponent_1<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Object __arg0, int __seq1, global::System.Object __arg1, int __seq2, global::System.Object __arg2, int __seq3, T __arg3)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (4,2)-(4,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, "method", __arg0);
         __builder.AddComponentParameter(__seq1, "onsubmit", __arg1);
         __builder.AddComponentParameter(__seq2, "@formname", __arg2);
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.mappings.txt
index 3bffc5fc0cf..da9f4220c29 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic/TestComponent.mappings.txt
@@ -42,23 +42,13 @@ Generated Location: (2388:80,0 [52] )
     [Parameter] public T Parameter { get; set; }
 |
 
-Source Location: (59:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (3038:99,0 [13] )
-|TestComponent|
-
 Source Location: (140:2,82 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Parameter|
-Generated Location: (3501:111,0 [9] )
+Generated Location: (3358:103,0 [9] )
 |Parameter|
 
-Source Location: (159:3,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (4059:124,0 [13] )
-|TestComponent|
-
 Source Location: (245:3,87 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Parameter|
-Generated Location: (4522:136,0 [9] )
+Generated Location: (4236:120,0 [9] )
 |Parameter|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.codegen.cs
index 4801a5de070..7227a02ca88 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.codegen.cs
@@ -94,15 +94,7 @@ internal static class TypeInference
     {
         public static void CreateTestComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Object __arg0, int __seq1, global::System.Object __arg1, int __seq2, global::System.Object __arg2, int __seq3, T __arg3)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<T>>(seq);
         __builder.AddAttribute(__seq0, "method", (object)__arg0);
         __builder.AddAttribute(__seq1, "onsubmit", (object)__arg1);
         __builder.AddAttribute(__seq2, "@formname", (object)__arg2);
@@ -119,15 +111,7 @@ public static void CreateTestComponent_0<T>(global::Microsoft.AspNetCore.Compone
         }
         public static void CreateTestComponent_1<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, global::System.Object __arg0, int __seq1, global::System.Object __arg1, int __seq2, global::System.Object __arg2, int __seq3, T __arg3)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (4,2)-(4,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<T>>(seq);
         __builder.AddAttribute(__seq0, "method", (object)__arg0);
         __builder.AddAttribute(__seq1, "onsubmit", (object)__arg1);
         __builder.AddAttribute(__seq2, "@formname", (object)__arg2);
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.mappings.txt
index 0bb7d413fd5..10733e3ec4b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_Generic_RazorLangVersion7/TestComponent.mappings.txt
@@ -42,23 +42,13 @@ Generated Location: (2388:80,0 [52] )
     [Parameter] public T Parameter { get; set; }
 |
 
-Source Location: (59:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (3038:99,0 [13] )
-|TestComponent|
-
 Source Location: (140:2,82 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Parameter|
-Generated Location: (3489:111,0 [9] )
+Generated Location: (3346:103,0 [9] )
 |Parameter|
 
-Source Location: (159:3,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (4055:124,0 [13] )
-|TestComponent|
-
 Source Location: (245:3,87 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Parameter|
-Generated Location: (4506:136,0 [9] )
+Generated Location: (4220:120,0 [9] )
 |Parameter|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.codegen.cs
index 410c8860b76..387d384955d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.codegen.cs
@@ -23,15 +23,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             __builder.AddAttribute(1, "method", (object)("post"));
             __builder.AddAttribute(2, "onsubmit", (object)(global::Microsoft.AspNetCore.Components.EventCallback.Factory.Create<global::System.EventArgs>(this, 
 #nullable restore
@@ -45,15 +37,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             __builder.AddAttribute(3, "@formname", (object)("named-form-handler"));
             __builder.CloseComponent();
             __builder.AddMarkupContent(4, "\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(5);
+            __builder.OpenComponent<global::Test.TestComponent>(5);
             __builder.AddAttribute(6, "method", (object)("post"));
             __builder.AddAttribute(7, "onsubmit", (object)(global::Microsoft.AspNetCore.Components.EventCallback.Factory.Create<global::System.EventArgs>(this, 
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.mappings.txt
index c0f000c8245..665e504a344 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Component_RazorLangVersion7/TestComponent.mappings.txt
@@ -3,28 +3,18 @@
 Generated Location: (372:12,0 [41] )
 |using Microsoft.AspNetCore.Components.Web|
 
-Source Location: (45:1,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (938:28,0 [13] )
-|TestComponent|
-
 Source Location: (84:1,40 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (1334:38,0 [9] )
+Generated Location: (1187:30,0 [9] )
 |() => { }|
 
-Source Location: (131:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1723:50,0 [13] )
-|TestComponent|
-
 Source Location: (170:2,40 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (2119:60,0 [9] )
+Generated Location: (1825:44,0 [9] )
 |() => { }|
 
 Source Location: (194:2,64 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 |"named-form-handler"|
-Generated Location: (2342:69,0 [20] )
+Generated Location: (2048:53,0 [20] )
 |"named-form-handler"|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.codegen.cs
index 33af613bf03..9fe63d38274 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.codegen.cs
@@ -38,15 +38,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             __builder.AddNamedEvent("onsubmit", __formName);
             __builder.CloseElement();
             __builder.AddMarkupContent(3, "\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(4);
+            __builder.OpenComponent<global::Test.TestComponent>(4);
             __builder.AddAttribute(5, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.OpenElement(6, "form");
                 __builder2.AddAttribute(7, "method", "post");
@@ -63,15 +55,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
                 __builder2.AddNamedEvent("onsubmit", __formName2_0);
                 __builder2.CloseElement();
                 __builder2.AddMarkupContent(9, "\r\n    ");
-                __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (5,6)-(5,19) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-                >(10);
+                __builder2.OpenComponent<global::Test.TestComponent>(10);
                 __builder2.AddAttribute(11, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder3) => {
                     __builder3.OpenElement(12, "form");
                     __builder3.AddAttribute(13, "method", "post");
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.mappings.txt
index db1d518d656..25ed0987d2e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/FormName_Nested/TestComponent.mappings.txt
@@ -8,36 +8,26 @@ Source Location: (75:1,31 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1146:30,0 [9] )
 |() => { }|
 
-Source Location: (110:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1638:43,0 [13] )
-|TestComponent|
-
 Source Location: (161:3,35 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (2207:55,0 [9] )
+Generated Location: (2060:47,0 [9] )
 |() => { }|
 
-Source Location: (200:4,5 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (2737:68,0 [13] )
-|TestComponent|
-
 Source Location: (255:5,39 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (3332:80,0 [9] )
+Generated Location: (3034:64,0 [9] )
 |() => { }|
 
 Source Location: (346:7,35 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |() => { }|
-Generated Location: (4186:98,0 [9] )
+Generated Location: (3888:82,0 [9] )
 |() => { }|
 
 Source Location: (405:9,7 [68] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     [Parameter] public RenderFragment ChildContent { get; set; }
 |
-Generated Location: (4722:114,0 [68] )
+Generated Location: (4424:98,0 [68] )
 |
     [Parameter] public RenderFragment ChildContent { get; set; }
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.codegen.cs
index 75929b24a9b..2eb8d29118c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.codegen.cs
@@ -25,15 +25,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (2,22)-(2,28) "x:\dir\subdir\Test\TestComponent.cshtml"
 TParam
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.mappings.txt
index f32b76da10b..b4173905812 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Action/TestComponent.mappings.txt
@@ -3,34 +3,29 @@
 Generated Location: (474:16,0 [6] )
 |TParam|
 
-Source Location: (20:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (934:30,0 [11] )
-|MyComponent|
-
 Source Location: (40:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TParam|
-Generated Location: (1094:38,0 [6] )
+Generated Location: (947:30,0 [6] )
 |TParam|
 
 Source Location: (54:1,35 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1343:47,0 [5] )
+Generated Location: (1196:39,0 [5] )
 |Value|
 
 Source Location: (65:1,46 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1589:55,0 [11] )
+Generated Location: (1442:47,0 [11] )
 |ParentValue|
 
 Source Location: (95:1,76 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (2189:64,0 [11] )
+Generated Location: (2042:56,0 [11] )
 |UpdateValue|
 
 Source Location: (84:1,65 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2425:73,0 [5] )
+Generated Location: (2278:65,0 [5] )
 |Value|
 
 Source Location: (119:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -39,7 +34,7 @@ Source Location: (119:2,7 [128] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public void UpdateValue(TParam value) { ParentValue = value; }
 |
-Generated Location: (2668:84,0 [128] )
+Generated Location: (2521:76,0 [128] )
 |
     public TParam ParentValue { get; set; } = default;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.codegen.cs
index 60ce5c72367..c2aeb9a7391 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.codegen.cs
@@ -25,15 +25,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (2,22)-(2,28) "x:\dir\subdir\Test\TestComponent.cshtml"
 TParam
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.mappings.txt
index c41b8c63915..eb30bcbc7e3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_EventCallback/TestComponent.mappings.txt
@@ -3,34 +3,29 @@
 Generated Location: (474:16,0 [6] )
 |TParam|
 
-Source Location: (20:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (934:30,0 [11] )
-|MyComponent|
-
 Source Location: (40:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TParam|
-Generated Location: (1094:38,0 [6] )
+Generated Location: (947:30,0 [6] )
 |TParam|
 
 Source Location: (54:1,35 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1343:47,0 [5] )
+Generated Location: (1196:39,0 [5] )
 |Value|
 
 Source Location: (65:1,46 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1589:55,0 [11] )
+Generated Location: (1442:47,0 [11] )
 |ParentValue|
 
 Source Location: (95:1,76 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (2189:64,0 [11] )
+Generated Location: (2042:56,0 [11] )
 |UpdateValue|
 
 Source Location: (84:1,65 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2425:73,0 [5] )
+Generated Location: (2278:65,0 [5] )
 |Value|
 
 Source Location: (119:2,7 [118] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -38,7 +33,7 @@ Source Location: (119:2,7 [118] x:\dir\subdir\Test\TestComponent.cshtml)
     public TParam ParentValue { get; set; } = default;
     public EventCallback<TParam> UpdateValue { get; set; }
 |
-Generated Location: (2668:84,0 [118] )
+Generated Location: (2521:76,0 [118] )
 |
     public TParam ParentValue { get; set; } = default;
     public EventCallback<TParam> UpdateValue { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.codegen.cs
index c38467a3459..f084612fbcb 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.codegen.cs
@@ -25,15 +25,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (2,22)-(2,28) "x:\dir\subdir\Test\TestComponent.cshtml"
 TParam
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.mappings.txt
index 0cf72bd05db..ce35563e522 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericBindToGenericComponent_ExplicitType_WithGetSet_Function/TestComponent.mappings.txt
@@ -3,34 +3,29 @@
 Generated Location: (474:16,0 [6] )
 |TParam|
 
-Source Location: (20:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (934:30,0 [11] )
-|MyComponent|
-
 Source Location: (40:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TParam|
-Generated Location: (1094:38,0 [6] )
+Generated Location: (947:30,0 [6] )
 |TParam|
 
 Source Location: (54:1,35 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1343:47,0 [5] )
+Generated Location: (1196:39,0 [5] )
 |Value|
 
 Source Location: (65:1,46 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1589:55,0 [11] )
+Generated Location: (1442:47,0 [11] )
 |ParentValue|
 
 Source Location: (95:1,76 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |UpdateValue|
-Generated Location: (2189:64,0 [11] )
+Generated Location: (2042:56,0 [11] )
 |UpdateValue|
 
 Source Location: (84:1,65 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2425:73,0 [5] )
+Generated Location: (2278:65,0 [5] )
 |Value|
 
 Source Location: (119:2,7 [155] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -39,7 +34,7 @@ Source Location: (119:2,7 [155] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public Task UpdateValue(TParam value) { ParentValue = value; return Task.CompletedTask; }
 |
-Generated Location: (2668:84,0 [155] )
+Generated Location: (2521:76,0 [155] )
 |
     public TParam ParentValue { get; set; } = default;
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.codegen.cs
index 96545220daa..e003be8e56b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.codegen.cs
@@ -25,15 +25,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (2,22)-(2,28) "x:\dir\subdir\Test\TestComponent.cshtml"
 TParam
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.mappings.txt
index f70bdf467e4..ce392ded33a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_ExplicitType_WithAfter_Action/TestComponent.mappings.txt
@@ -3,34 +3,29 @@
 Generated Location: (474:16,0 [6] )
 |TParam|
 
-Source Location: (20:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (934:30,0 [11] )
-|MyComponent|
-
 Source Location: (40:1,21 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TParam|
-Generated Location: (1094:38,0 [6] )
+Generated Location: (947:30,0 [6] )
 |TParam|
 
 Source Location: (54:1,35 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1343:47,0 [5] )
+Generated Location: (1196:39,0 [5] )
 |Value|
 
 Source Location: (65:1,46 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |ParentValue|
-Generated Location: (1589:55,0 [11] )
+Generated Location: (1442:47,0 [11] )
 |ParentValue|
 
 Source Location: (97:1,78 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |Update|
-Generated Location: (2022:64,0 [6] )
+Generated Location: (1875:56,0 [6] )
 |Update|
 
 Source Location: (84:1,65 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2242:73,0 [5] )
+Generated Location: (2095:65,0 [5] )
 |Value|
 
 Source Location: (116:2,7 [79] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -39,7 +34,7 @@ Source Location: (116:2,7 [79] x:\dir\subdir\Test\TestComponent.cshtml)
 
     public void Update() { }
 |
-Generated Location: (2485:84,0 [79] )
+Generated Location: (2338:76,0 [79] )
 |
     public TParam ParentValue { get; set; }
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithAfter_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithAfter_Action/TestComponent.codegen.cs
index a3d5c97539f..91d7b1d6a9e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithAfter_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithAfter_Action/TestComponent.codegen.cs
@@ -64,15 +64,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0, int __seq1, global::System.Action<TValue> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TValue>.
 #nullable restore
 #line (2,20)-(2,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithAfter_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithAfter_Action/TestComponent.mappings.txt
index d5c8621124d..4fbc1b895f8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithAfter_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithAfter_Action/TestComponent.mappings.txt
@@ -26,13 +26,8 @@ Generated Location: (1491:48,0 [79] )
     public void Update() { }
 |
 
-Source Location: (20:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2100:69,0 [11] )
-|MyComponent|
-
 Source Location: (38:1,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2360:78,0 [5] )
+Generated Location: (2217:70,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.codegen.cs
index 3be1a0d8ef7..85519c2896b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.codegen.cs
@@ -64,15 +64,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TValue> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TValue>.
 #nullable restore
 #line (2,20)-(2,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.mappings.txt
index 601da420f49..6886fc84d8c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Action/TestComponent.mappings.txt
@@ -26,13 +26,8 @@ Generated Location: (1553:48,0 [128] )
     public void UpdateValue(TParam value) { ParentValue = value; }
 |
 
-Source Location: (20:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2243:69,0 [11] )
-|MyComponent|
-
 Source Location: (38:1,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2503:78,0 [5] )
+Generated Location: (2360:70,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.codegen.cs
index d05c12841ca..5d06df85eb8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.codegen.cs
@@ -63,15 +63,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TValue> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TValue>.
 #nullable restore
 #line (2,20)-(2,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.mappings.txt
index 595d1b28861..d08c43f4646 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_EventCallback/TestComponent.mappings.txt
@@ -24,13 +24,8 @@ Generated Location: (1553:48,0 [118] )
     public EventCallback<TParam> UpdateValue { get; set; }
 |
 
-Source Location: (20:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2233:68,0 [11] )
-|MyComponent|
-
 Source Location: (38:1,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2493:77,0 [5] )
+Generated Location: (2350:69,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.codegen.cs
index ada34782dad..c8d9527c663 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.codegen.cs
@@ -64,15 +64,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TValue> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TValue>.
 #nullable restore
 #line (2,20)-(2,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.mappings.txt
index 951f2496ebc..e0ca795cbd6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentBindToGenericComponent_InferredType_WithGetSet_Function/TestComponent.mappings.txt
@@ -26,13 +26,8 @@ Generated Location: (1553:48,0 [155] )
     public Task UpdateValue(TParam value) { ParentValue = value; return Task.CompletedTask; }
 |
 
-Source Location: (20:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2270:69,0 [11] )
-|MyComponent|
-
 Source Location: (38:1,19 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (2530:78,0 [5] )
+Generated Location: (2387:70,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentMultipleTypeParamUsage/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentMultipleTypeParamUsage/TestComponent.codegen.cs
index 3ccf2dfd4b8..0b918f4d88e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentMultipleTypeParamUsage/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentMultipleTypeParamUsage/TestComponent.codegen.cs
@@ -33,15 +33,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (11,2)-(11,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.TestComponent<
 #nullable restore
 #line (11,36)-(11,42) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentMultipleTypeParamUsage/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentMultipleTypeParamUsage/TestComponent.mappings.txt
index 77315e91435..381fc4471b6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentMultipleTypeParamUsage/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentMultipleTypeParamUsage/TestComponent.mappings.txt
@@ -8,19 +8,14 @@ Source Location: (29:1,11 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (620:24,0 [6] )
 |TItem2|
 
-Source Location: (168:10,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1082:38,0 [13] )
-|TestComponent|
-
 Source Location: (202:10,35 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (1246:46,0 [6] )
+Generated Location: (1097:38,0 [6] )
 |string|
 
 Source Location: (190:10,23 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (1404:54,0 [3] )
+Generated Location: (1255:46,0 [3] )
 |int|
 
 Source Location: (44:2,7 [118] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -31,7 +26,7 @@ Source Location: (44:2,7 [118] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public TItem2 MyItem2 { get; set; }
 |
-Generated Location: (1649:65,0 [118] )
+Generated Location: (1500:57,0 [118] )
 |
     [Parameter]
     public TItem MyItem { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression/TestComponent.codegen.cs
index 1f8314bbcc0..a78ea9a4498 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression/TestComponent.codegen.cs
@@ -25,15 +25,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,2)-(7,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.TestComponent<
 #nullable restore
 #line (7,24)-(7,30) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression/TestComponent.mappings.txt
index 7724d8de130..2dc326461b9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression/TestComponent.mappings.txt
@@ -3,14 +3,9 @@
 Generated Location: (474:16,0 [5] )
 |TItem|
 
-Source Location: (89:6,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (933:30,0 [13] )
-|TestComponent|
-
 Source Location: (111:6,23 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (1095:38,0 [6] )
+Generated Location: (948:30,0 [6] )
 |string|
 
 Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +13,7 @@ Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public TItem MyItem { get; set; }
 |
-Generated Location: (1343:49,0 [58] )
+Generated Location: (1196:41,0 [58] )
 |
     [Parameter]
     public TItem MyItem { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression2/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression2/TestComponent.codegen.cs
index 23f90e3028a..7c0b449e012 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression2/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression2/TestComponent.codegen.cs
@@ -25,15 +25,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,2)-(7,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.TestComponent<
 #nullable restore
 #line (7,25)-(7,31) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression2/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression2/TestComponent.mappings.txt
index ceb253af2ca..252f4ee99a7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression2/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeParamUsageWithImplicitExpression2/TestComponent.mappings.txt
@@ -3,14 +3,9 @@
 Generated Location: (474:16,0 [5] )
 |TItem|
 
-Source Location: (89:6,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (933:30,0 [13] )
-|TestComponent|
-
 Source Location: (112:6,24 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (1095:38,0 [6] )
+Generated Location: (948:30,0 [6] )
 |string|
 
 Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +13,7 @@ Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public TItem MyItem { get; set; }
 |
-Generated Location: (1343:49,0 [58] )
+Generated Location: (1196:41,0 [58] )
 |
     [Parameter]
     public TItem MyItem { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsage/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsage/TestComponent.codegen.cs
index 9cf58f614db..41d0bc99d7a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsage/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsage/TestComponent.codegen.cs
@@ -25,15 +25,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,2)-(7,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.TestComponent<
 #nullable restore
 #line (7,23)-(7,29) "x:\dir\subdir\Test\TestComponent.cshtml"
 string
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsage/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsage/TestComponent.mappings.txt
index 091306a8f4d..48162741197 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsage/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsage/TestComponent.mappings.txt
@@ -3,14 +3,9 @@
 Generated Location: (474:16,0 [5] )
 |TItem|
 
-Source Location: (89:6,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (933:30,0 [13] )
-|TestComponent|
-
 Source Location: (110:6,22 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (1095:38,0 [6] )
+Generated Location: (948:30,0 [6] )
 |string|
 
 Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +13,7 @@ Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public TItem MyItem { get; set; }
 |
-Generated Location: (1343:49,0 [58] )
+Generated Location: (1196:41,0 [58] )
 |
     [Parameter]
     public TItem MyItem { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWhitespace/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWhitespace/TestComponent.codegen.cs
index 9bdba0e7c74..1526328ed78 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWhitespace/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWhitespace/TestComponent.codegen.cs
@@ -25,15 +25,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,2)-(7,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.TestComponent<
 #nullable restore
 #line (7,23)-(7,33) "x:\dir\subdir\Test\TestComponent.cshtml"
   string  
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWhitespace/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWhitespace/TestComponent.mappings.txt
index 390248a03ef..703b596644a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWhitespace/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWhitespace/TestComponent.mappings.txt
@@ -3,14 +3,9 @@
 Generated Location: (474:16,0 [5] )
 |TItem|
 
-Source Location: (89:6,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (933:30,0 [13] )
-|TestComponent|
-
 Source Location: (110:6,22 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |  string  |
-Generated Location: (1095:38,0 [10] )
+Generated Location: (948:30,0 [10] )
 |  string  |
 
 Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +13,7 @@ Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public TItem MyItem { get; set; }
 |
-Generated Location: (1347:49,0 [58] )
+Generated Location: (1200:41,0 [58] )
 |
     [Parameter]
     public TItem MyItem { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithGenericType/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithGenericType/TestComponent.codegen.cs
index 576d8dbbedc..0018c48ace9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithGenericType/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithGenericType/TestComponent.codegen.cs
@@ -25,15 +25,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,2)-(7,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.TestComponent<
 #nullable restore
 #line (7,23)-(7,44) "x:\dir\subdir\Test\TestComponent.cshtml"
 TestComponent<string>
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithGenericType/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithGenericType/TestComponent.mappings.txt
index 40811137ee9..93bc1c3475b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithGenericType/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithGenericType/TestComponent.mappings.txt
@@ -3,14 +3,9 @@
 Generated Location: (474:16,0 [5] )
 |TItem|
 
-Source Location: (89:6,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (933:30,0 [13] )
-|TestComponent|
-
 Source Location: (110:6,22 [21] x:\dir\subdir\Test\TestComponent.cshtml)
 |TestComponent<string>|
-Generated Location: (1095:38,0 [21] )
+Generated Location: (948:30,0 [21] )
 |TestComponent<string>|
 
 Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +13,7 @@ Source Location: (25:1,7 [58] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public TItem MyItem { get; set; }
 |
-Generated Location: (1358:49,0 [58] )
+Generated Location: (1211:41,0 [58] )
 |
     [Parameter]
     public TItem MyItem { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithInference/TestComponent.codegen.cs
index a15ac9df611..30bf3bf117a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithInference/TestComponent.codegen.cs
@@ -55,15 +55,7 @@ internal static class TypeInference
     {
         public static void CreateTestComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,2)-(7,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.TestComponent<TItem>.
 #nullable restore
 #line (7,16)-(7,22) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithInference/TestComponent.mappings.txt
index 57c2b2cf3ac..8586ee8b31f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponentTypeUsageWithInference/TestComponent.mappings.txt
@@ -19,13 +19,8 @@ Generated Location: (1184:40,0 [58] )
     public TItem MyItem { get; set; }
 |
 
-Source Location: (89:6,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1722:60,0 [13] )
-|TestComponent|
-
 Source Location: (103:6,15 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyItem|
-Generated Location: (1984:69,0 [6] )
+Generated Location: (1841:61,0 [6] )
 |MyItem|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.codegen.cs
index cf7b2dae2a7..1d3d35db243 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.codegen.cs
@@ -31,15 +31,7 @@ public partial class TestComponent<
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (3,21)-(3,27) "x:\dir\subdir\Test\TestComponent.cshtml"
 TChild
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.mappings.txt
index dbdd257e7f3..30e422cc98a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeExplicit/TestComponent.mappings.txt
@@ -8,23 +8,18 @@ Source Location: (11:0,11 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (595:22,0 [6] )
 |TChild|
 
-Source Location: (33:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1055:36,0 [11] )
-|MyComponent|
-
 Source Location: (52:2,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |TChild|
-Generated Location: (1215:44,0 [6] )
+Generated Location: (1068:36,0 [6] )
 |TChild|
 
 Source Location: (60:2,28 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEvent|
-Generated Location: (1464:53,0 [7] )
+Generated Location: (1317:45,0 [7] )
 |MyEvent|
 
 Source Location: (69:2,37 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |(TChild x) => {}|
-Generated Location: (1850:61,0 [16] )
+Generated Location: (1703:53,0 [16] )
 |(TChild x) => {}|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.codegen.cs
index 2b55cebdc91..64b7d67bf54 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.codegen.cs
@@ -69,15 +69,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (3,14)-(3,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.mappings.txt
index 708b6485ded..cdca58b2a0b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_NestedTypeInference/TestComponent.mappings.txt
@@ -29,18 +29,13 @@ Generated Location: (1553:54,0 [138] )
         [Parameter] public EventCallback<TChild> MyChildEvent { get; set; }
 |
 
-Source Location: (33:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2250:74,0 [11] )
-|MyComponent|
-
 Source Location: (45:2,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2508:83,0 [4] )
+Generated Location: (2365:75,0 [4] )
 |Item|
 
 Source Location: (62:2,30 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEvent|
-Generated Location: (2756:92,0 [7] )
+Generated Location: (2613:84,0 [7] )
 |MyEvent|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index 729f067abaa..04e2157186d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -51,15 +51,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TItem> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (2,14)-(2,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
index ced50958cd3..c486eb8f2c6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithGenericTypeParameter_TypeInference/TestComponent.mappings.txt
@@ -13,18 +13,13 @@ Source Location: (44:1,31 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1187:36,0 [13] )
 |(int x) => {}|
 
-Source Location: (14:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1825:56,0 [11] )
-|MyComponent|
-
 Source Location: (26:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2083:65,0 [4] )
+Generated Location: (1940:57,0 [4] )
 |Item|
 
 Source Location: (35:1,22 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEvent|
-Generated Location: (2331:74,0 [7] )
+Generated Location: (2188:66,0 [7] )
 |MyEvent|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.codegen.cs
index 7a9182f2252..f06ed0f2c3f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.codegen.cs
@@ -56,15 +56,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.IEnumerable<TItem>> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (3,14)-(3,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.mappings.txt
index 578c44eed31..479997d5071 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallbackWithNestedGenericTypeParameter_TypeInference/TestComponent.mappings.txt
@@ -18,18 +18,13 @@ Source Location: (79:2,31 [26] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1283:41,0 [26] )
 |(IEnumerable<int> x) => {}|
 
-Source Location: (49:2,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1982:61,0 [11] )
-|MyComponent|
-
 Source Location: (61:2,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2240:70,0 [4] )
+Generated Location: (2097:62,0 [4] )
 |Item|
 
 Source Location: (70:2,22 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEvent|
-Generated Location: (2488:79,0 [7] )
+Generated Location: (2345:71,0 [7] )
 |MyEvent|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
index fe9e1dcd7db..aeb12d5d069 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -51,15 +51,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::Test.MyEventArgs> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (2,14)-(2,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
index bc04ff942bc..d6a6111ba10 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_GenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -13,18 +13,13 @@ Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1213:36,0 [7] )
 |x => {}|
 
-Source Location: (14:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1864:56,0 [11] )
-|MyComponent|
-
 Source Location: (26:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2122:65,0 [4] )
+Generated Location: (1979:57,0 [4] )
 |Item|
 
 Source Location: (35:1,22 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEvent|
-Generated Location: (2370:74,0 [7] )
+Generated Location: (2227:66,0 [7] )
 |MyEvent|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
index 2f52a124738..64b94ab0904 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -51,15 +51,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<global::System.Collections.Generic.List<global::System.Collections.Generic.Dictionary<global::System.String, global::Test.MyEventArgs[]>>> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (2,14)-(2,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
index 97dd9736a6b..842cda3d95a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NestedGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -13,18 +13,13 @@ Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1302:36,0 [7] )
 |x => {}|
 
-Source Location: (14:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2066:56,0 [11] )
-|MyComponent|
-
 Source Location: (26:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2324:65,0 [4] )
+Generated Location: (2181:57,0 [4] )
 |Item|
 
 Source Location: (35:1,22 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEvent|
-Generated Location: (2572:74,0 [7] )
+Generated Location: (2429:66,0 [7] )
 |MyEvent|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
index ef409ccd352..37d26e0ac1c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.codegen.cs
@@ -51,15 +51,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (2,14)-(2,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
index e3646944518..c0aa1d96bcf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericEventCallback_TypeInference/TestComponent.mappings.txt
@@ -13,18 +13,13 @@ Source Location: (44:1,31 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1187:36,0 [7] )
 |x => {}|
 
-Source Location: (14:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1812:56,0 [11] )
-|MyComponent|
-
 Source Location: (26:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2070:65,0 [4] )
+Generated Location: (1927:57,0 [4] )
 |Item|
 
 Source Location: (35:1,22 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |MyEvent|
-Generated Location: (2318:74,0 [7] )
+Generated Location: (2175:66,0 [7] )
 |MyEvent|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
index a3790864772..29701915f87 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.codegen.cs
@@ -60,15 +60,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Test.Shared.MyClass __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (2,14)-(2,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
index 9a359856bd6..401c5557f8a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonGenericParameter_TypeInference/TestComponent.mappings.txt
@@ -22,18 +22,13 @@ Generated Location: (1321:46,0 [38] )
     MyClass Hello = new MyClass();
 |
 
-Source Location: (21:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1885:65,0 [11] )
-|MyComponent|
-
 Source Location: (33:1,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2143:74,0 [4] )
+Generated Location: (2000:66,0 [4] )
 |Item|
 
 Source Location: (42:1,22 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |Foo|
-Generated Location: (2391:83,0 [3] )
+Generated Location: (2248:75,0 [3] )
 |Foo|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveType/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveType/TestComponent.codegen.cs
index 69765339b4f..644d8ae65f7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveType/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveType/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,21)-(1,31) "x:\dir\subdir\Test\TestComponent.cshtml"
 CustomType
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveType/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveType/TestComponent.mappings.txt
index 1b66ad0bdb1..ff319969729 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveType/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveType/TestComponent.mappings.txt
@@ -1,20 +1,15 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (20:0,20 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (20:0,20 [10] x:\dir\subdir\Test\TestComponent.cshtml)
 |CustomType|
-Generated Location: (946:30,0 [10] )
+Generated Location: (799:22,0 [10] )
 |CustomType|
 
 Source Location: (32:0,32 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1203:39,0 [4] )
+Generated Location: (1056:31,0 [4] )
 |Item|
 
 Source Location: (38:0,38 [16] x:\dir\subdir\Test\TestComponent.cshtml)
 |new CustomType()|
-Generated Location: (1452:47,0 [16] )
+Generated Location: (1305:39,0 [16] )
 |new CustomType()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveTypeRenderFragment/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveTypeRenderFragment/TestComponent.codegen.cs
index 37464a3cd64..ff2d7ad0810 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveTypeRenderFragment/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveTypeRenderFragment/TestComponent.codegen.cs
@@ -47,15 +47,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<global::Test.CustomType> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveTypeRenderFragment/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveTypeRenderFragment/TestComponent.mappings.txt
index 211de75d6b5..c6d377f54de 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveTypeRenderFragment/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_NonPrimitiveTypeRenderFragment/TestComponent.mappings.txt
@@ -8,13 +8,8 @@ Source Location: (38:0,38 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1064:30,25 [18] )
 |context.ToString()|
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1760:52,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2018:61,0 [4] )
+Generated Location: (1875:53,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_TypeParameterOrdering/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_TypeParameterOrdering/TestComponent.codegen.cs
index 08483f7a16e..84f09104bd6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_TypeParameterOrdering/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_TypeParameterOrdering/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,38)-(1,56) "x:\dir\subdir\Test\TestComponent.cshtml"
 IComposedInterface
@@ -62,15 +54,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             __builder.AddComponentParameter(2, nameof(global::Test.MyComponent<IComposedInterface, string>.ValueChanged), global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.TypeCheck<global::Microsoft.AspNetCore.Components.EventCallback<string>>(global::Microsoft.AspNetCore.Components.EventCallback.Factory.Create<string>(this, global::Microsoft.AspNetCore.Components.CompilerServices.RuntimeHelpers.CreateInferredEventCallback(this, __value => _componentValue = __value, _componentValue))));
             __builder.CloseComponent();
             __builder.AddMarkupContent(3, "\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (2,24)-(2,42) "x:\dir\subdir\Test\TestComponent.cshtml"
 IComposedInterface
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_TypeParameterOrdering/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_TypeParameterOrdering/TestComponent.mappings.txt
index 2f34ef2a774..0a33557d3fc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_TypeParameterOrdering/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_TypeParameterOrdering/TestComponent.mappings.txt
@@ -1,58 +1,48 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (37:0,37 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (37:0,37 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |IComposedInterface|
-Generated Location: (946:30,0 [18] )
+Generated Location: (799:22,0 [18] )
 |IComposedInterface|
 
 Source Location: (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (1114:38,0 [6] )
+Generated Location: (967:30,0 [6] )
 |string|
 
 Source Location: (63:0,63 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (1383:47,0 [5] )
+Generated Location: (1236:39,0 [5] )
 |Value|
 
 Source Location: (70:0,70 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |_componentValue|
-Generated Location: (1629:55,0 [15] )
+Generated Location: (1482:47,0 [15] )
 |_componentValue|
 
-Source Location: (92:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2454:67,0 [11] )
-|MyComponent|
-
 Source Location: (114:1,23 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |IComposedInterface|
-Generated Location: (2614:75,0 [18] )
+Generated Location: (2320:59,0 [18] )
 |IComposedInterface|
 
 Source Location: (140:1,49 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |string|
-Generated Location: (2782:83,0 [6] )
+Generated Location: (2488:67,0 [6] )
 |string|
 
 Source Location: (154:1,63 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (3051:92,0 [5] )
+Generated Location: (2757:76,0 [5] )
 |Value|
 
 Source Location: (161:1,70 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |_componentValue|
-Generated Location: (3297:100,0 [15] )
+Generated Location: (3003:84,0 [15] )
 |_componentValue|
 
 Source Location: (191:3,7 [46] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string _componentValue = string.Empty;
 |
-Generated Location: (4067:112,0 [46] )
+Generated Location: (3773:96,0 [46] )
 |
     string _componentValue = string.Empty;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.codegen.cs
index 47e7283fc82..e79d9aab3e6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.codegen.cs
@@ -44,15 +44,7 @@ internal static class TypeInference
         public static void CreateMyComponent_0<T>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T __arg0)
             where T : unmanaged
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<T>.
 #nullable restore
 #line (2,14)-(2,23) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.mappings.txt
index 801f6f0e9e9..4884032ea02 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_UnmanagedConstraint/TestComponent.mappings.txt
@@ -8,13 +8,8 @@ Source Location: (37:1,24 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (958:28,0 [1] )
 |1|
 
-Source Location: (14:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1527:49,0 [11] )
-|MyComponent|
-
 Source Location: (26:1,13 [9] x:\dir\subdir\Test\TestComponent.cshtml)
 |Parameter|
-Generated Location: (1777:58,0 [9] )
+Generated Location: (1634:50,0 [9] )
 |Parameter|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
index 666fd9671f6..69f9e26fd5e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,20)-(1,23) "x:\dir\subdir\Test\TestComponent.cshtml"
 int
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
index 26edd72d6ce..5d649aaf94b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_CreatesDiagnostic/TestComponent.mappings.txt
@@ -1,26 +1,21 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (946:30,0 [3] )
+Generated Location: (799:22,0 [3] )
 |int|
 
 Source Location: (23:0,23 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1189:39,0 [4] )
+Generated Location: (1042:31,0 [4] )
 |Item|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1431:47,0 [1] )
+Generated Location: (1284:39,0 [1] )
 |3|
 
 Source Location: (38:0,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |_my|
-Generated Location: (1653:56,0 [3] )
+Generated Location: (1506:48,0 [3] )
 |_my|
 
 Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -28,7 +23,7 @@ Source Location: (56:2,7 [90] x:\dir\subdir\Test\TestComponent.cshtml)
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
 |
-Generated Location: (1969:69,0 [90] )
+Generated Location: (1822:61,0 [90] )
 |
     private MyComponent<int> _my;
     public void Foo() { System.GC.KeepAlive(_my); }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
index f168029ffdf..2c8e92cfa22 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.codegen.cs
@@ -57,15 +57,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::System.Action<global::Test.MyComponent<TItem>> __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
index 7406c1596d6..2092c343fd4 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithComponentRef_TypeInference_CreatesDiagnostic/TestComponent.mappings.txt
@@ -19,13 +19,8 @@ Generated Location: (1249:42,0 [90] )
     public void Foo() { System.GC.KeepAlive(_my); }
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1892:62,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2150:71,0 [4] )
+Generated Location: (2007:63,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index cafa26093bb..1433672a698 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -49,15 +49,7 @@ internal static class TypeInference
     {
         public static void CreateTest_MyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, global::Microsoft.AspNetCore.Components.RenderFragment<TItem> __arg1)
         {
-        __builder.OpenComponent<global::
-#nullable restore
-#line (1,2)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
-Test.MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,19)-(1,23) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
index ae8f13e770d..5a01b576210 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.mappings.txt
@@ -8,13 +8,8 @@ Source Location: (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1107:31,25 [17] )
 |context.ToLower()|
 
-Source Location: (1:0,1 [16] x:\dir\subdir\Test\TestComponent.cshtml)
-|Test.MyComponent|
-Generated Location: (1828:54,0 [16] )
-|Test.MyComponent|
-
 Source Location: (18:0,18 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2091:63,0 [4] )
+Generated Location: (1948:55,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
index b6d270eec7a..82d8e11f944 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            <
+            __builder.OpenComponent<global::Test.MyComponent<
 #nullable restore
 #line (1,20)-(1,23) "x:\dir\subdir\Test\TestComponent.cshtml"
 int
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
index 74b4765258e..155a6923fb5 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey/TestComponent.mappings.txt
@@ -1,33 +1,28 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |int|
-Generated Location: (946:30,0 [3] )
+Generated Location: (799:22,0 [3] )
 |int|
 
 Source Location: (23:0,23 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1189:39,0 [4] )
+Generated Location: (1042:31,0 [4] )
 |Item|
 
 Source Location: (29:0,29 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |3|
-Generated Location: (1431:47,0 [1] )
+Generated Location: (1284:39,0 [1] )
 |3|
 
 Source Location: (38:0,38 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |_someKey|
-Generated Location: (1614:56,0 [8] )
+Generated Location: (1467:48,0 [8] )
 |_someKey|
 
 Source Location: (61:2,7 [47] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private object _someKey = new object();
 |
-Generated Location: (1862:68,0 [47] )
+Generated Location: (1715:60,0 [47] )
 |
     private object _someKey = new object();
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
index c69cf0eab46..852ed3a9bcf 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.codegen.cs
@@ -55,15 +55,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<TItem>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TItem __arg0, int __seq1, object __arg1)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TItem>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<TItem>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<TItem>.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
index ee2389040b1..f5c85016a03 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithKey_TypeInference/TestComponent.mappings.txt
@@ -17,13 +17,8 @@ Generated Location: (1198:41,0 [47] )
     private object _someKey = new object();
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1750:60,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (2008:69,0 [4] )
+Generated Location: (1865:61,0 [4] )
 |Item|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_01/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_01/TestComponent.codegen.cs
index 46e5241ea4c..bf124352035 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_01/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_01/TestComponent.codegen.cs
@@ -73,15 +73,7 @@ internal static class TypeInference
     {
         public static void CreateInputRadioGroup_0<[global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(unchecked((global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes)0xffffffff))] TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0, int __seq1, global::Microsoft.AspNetCore.Components.EventCallback<TValue> __arg1, int __seq2, global::System.Linq.Expressions.Expression<global::System.Func<TValue>> __arg2, int __seq3, global::Microsoft.AspNetCore.Components.RenderFragment __arg3)
         {
-        __builder.OpenComponent<global::Microsoft.AspNetCore.Components.Forms.
-#nullable restore
-#line (3,2)-(3,17) "x:\dir\subdir\Test\TestComponent.cshtml"
-InputRadioGroup
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Microsoft.AspNetCore.Components.Forms.InputRadioGroup<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Microsoft.AspNetCore.Components.Forms.InputRadioGroup<TValue>.
 #nullable restore
 #line (3,24)-(3,29) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -98,15 +90,7 @@ internal static class TypeInference
         }
         public static void CreateInputRadio_1<[global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(unchecked((global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes)0xffffffff))] TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0)
         {
-        __builder.OpenComponent<global::Microsoft.AspNetCore.Components.Forms.
-#nullable restore
-#line (4,6)-(4,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-InputRadio
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Microsoft.AspNetCore.Components.Forms.InputRadio<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Microsoft.AspNetCore.Components.Forms.InputRadio<TValue>.
 #nullable restore
 #line (4,17)-(4,22) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -120,15 +104,7 @@ internal static class TypeInference
         }
         public static void CreateInputRadio_2<[global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(unchecked((global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes)0xffffffff))] TValue>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, TValue __arg0)
         {
-        __builder.OpenComponent<global::Microsoft.AspNetCore.Components.Forms.
-#nullable restore
-#line (5,6)-(5,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-InputRadio
-
-#line default
-#line hidden
-#nullable disable
-        <TValue>>(seq);
+        __builder.OpenComponent<global::Microsoft.AspNetCore.Components.Forms.InputRadio<TValue>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Microsoft.AspNetCore.Components.Forms.InputRadio<TValue>.
 #nullable restore
 #line (5,17)-(5,22) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_01/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_01/TestComponent.mappings.txt
index a848c8b047d..acddc46cbae 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_01/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_01/TestComponent.mappings.txt
@@ -27,33 +27,18 @@ Generated Location: (2082:59,0 [39] )
     private string value1 = "true";
 |
 
-Source Location: (49:2,1 [15] x:\dir\subdir\Test\TestComponent.cshtml)
-|InputRadioGroup|
-Generated Location: (3060:78,0 [15] )
-|InputRadioGroup|
-
 Source Location: (71:2,23 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (3361:87,0 [5] )
+Generated Location: (3218:79,0 [5] )
 |Value|
 
-Source Location: (93:3,5 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|InputRadio|
-Generated Location: (4379:103,0 [10] )
-|InputRadio|
-
 Source Location: (104:3,16 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (4670:112,0 [5] )
+Generated Location: (4384:96,0 [5] )
 |Value|
 
-Source Location: (132:4,5 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|InputRadio|
-Generated Location: (5311:125,0 [10] )
-|InputRadio|
-
 Source Location: (143:4,16 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Value|
-Generated Location: (5602:134,0 [5] )
+Generated Location: (5173:110,0 [5] )
 |Value|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_02/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_02/TestComponent.codegen.cs
index f02ccff9b8a..79b517bb297 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_02/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_02/TestComponent.codegen.cs
@@ -62,15 +62,7 @@ internal static class TypeInference
     {
         public static void CreateMyComponent_0<T1, [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(unchecked((global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes)0x00000028))] T2, [global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(unchecked((global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes)0x00000000))] T3>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, T1 __arg0, int __seq1, T2 __arg1, int __seq2, T3 __arg2)
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-        <T1, T2, T3>>(seq);
+        __builder.OpenComponent<global::Test.MyComponent<T1, T2, T3>>(seq);
         __builder.AddComponentParameter(__seq0, nameof(global::Test.MyComponent<T1, T2, T3>.
 #nullable restore
 #line (1,14)-(1,16) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_02/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_02/TestComponent.mappings.txt
index 32ce907c89f..e47bea3a94d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_02/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericInference_DynamicallyAccessedMembers_02/TestComponent.mappings.txt
@@ -22,23 +22,18 @@ Generated Location: (1343:48,0 [31] )
     private string s = "x";
 |
 
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2246:67,0 [11] )
-|MyComponent|
-
 Source Location: (13:0,13 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |P1|
-Generated Location: (2514:76,0 [2] )
+Generated Location: (2371:68,0 [2] )
 |P1|
 
 Source Location: (20:0,20 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |P2|
-Generated Location: (2765:85,0 [2] )
+Generated Location: (2622:77,0 [2] )
 |P2|
 
 Source Location: (27:0,27 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |P3|
-Generated Location: (3016:94,0 [2] )
+Generated Location: (2873:86,0 [2] )
 |P3|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericTypeCheck/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericTypeCheck/TestComponent.codegen.cs
index 04162740f7f..bb2b60e9920 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericTypeCheck/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericTypeCheck/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.TestComponent.
 #nullable restore
 #line (1,16)-(1,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericTypeCheck/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericTypeCheck/TestComponent.mappings.txt
index 42646f88988..419d824f7ea 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericTypeCheck/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericTypeCheck/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (15:0,15 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (15:0,15 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Data|
-Generated Location: (1035:31,0 [4] )
+Generated Location: (888:23,0 [4] )
 |Data|
 
 Source Location: (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |null|
-Generated Location: (1336:39,0 [4] )
+Generated Location: (1189:31,0 [4] )
 |null|
 
 Source Location: (40:2,7 [172] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -25,7 +20,7 @@ Source Location: (40:2,7 [172] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public List<global::System.String> Data { get; set; }
 |
-Generated Location: (1580:50,0 [172] )
+Generated Location: (1433:42,0 [172] )
 |
     private class System
     {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddAttribute/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddAttribute/TestComponent.codegen.cs
index d55e78749f4..04335dd0de6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddAttribute/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddAttribute/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddAttribute(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddAttribute/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddAttribute/TestComponent.mappings.txt
index ab0106f7bad..b01cda0ae12 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddAttribute/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddAttribute/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |PlaceHolder|
-Generated Location: (1022:31,0 [11] )
+Generated Location: (875:23,0 [11] )
 |Placeholder|
 
 Source Location: (28:0,28 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |new MyClass()|
-Generated Location: (1298:39,0 [13] )
+Generated Location: (1151:31,0 [13] )
 |new MyClass()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddComponentParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddComponentParameter/TestComponent.codegen.cs
index c64aa4d9f72..8a15e19fa41 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddComponentParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddComponentParameter/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddComponentParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddComponentParameter/TestComponent.mappings.txt
index 2365d212b4b..70756d5b4e6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddComponentParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_AddComponentParameter/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |PlaceHolder|
-Generated Location: (1031:31,0 [11] )
+Generated Location: (884:23,0 [11] )
 |Placeholder|
 
 Source Location: (28:0,28 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |new MyClass()|
-Generated Location: (1298:39,0 [13] )
+Generated Location: (1151:31,0 [13] )
 |new MyClass()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind/TestComponent.codegen.cs
index ba50a8b213c..f3b38663347 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,20)-(1,31) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind/TestComponent.mappings.txt
index 576f0f96c9b..376104183be 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind/TestComponent.mappings.txt
@@ -1,23 +1,18 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |PlaceHolder|
-Generated Location: (1031:31,0 [11] )
+Generated Location: (884:23,0 [11] )
 |Placeholder|
 
 Source Location: (32:0,32 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |s|
-Generated Location: (1298:39,0 [1] )
+Generated Location: (1151:31,0 [1] )
 |s|
 
 Source Location: (48:2,7 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string s = "abc";
 |
-Generated Location: (2034:51,0 [33] )
+Generated Location: (1887:43,0 [33] )
 |
     private string s = "abc";
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_02/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_02/TestComponent.codegen.cs
index cab686c32a4..88e989c97f3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_02/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_02/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "@Bind-Placeholder", 
 #nullable restore
 #line (1,34)-(1,35) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_02/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_02/TestComponent.mappings.txt
index fe8a520a6f6..1ed51a1dc34 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_02/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_02/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (33:0,33 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (33:0,33 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |s|
-Generated Location: (1020:31,0 [1] )
+Generated Location: (873:23,0 [1] )
 |s|
 
 Source Location: (49:2,7 [33] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string s = "abc";
 |
-Generated Location: (1259:42,0 [33] )
+Generated Location: (1112:34,0 [33] )
 |
     private string s = "abc";
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_03/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_03/TestComponent.codegen.cs
index 8727f3aab1c..46a6ee4796a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_03/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_03/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, "Placeholder:Get", 
 #nullable restore
 #line (1,37)-(1,38) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_03/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_03/TestComponent.mappings.txt
index 4764f5ad0b5..05e5eedb366 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_03/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Bind_03/TestComponent.mappings.txt
@@ -1,11 +1,6 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (36:0,36 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (36:0,36 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |s|
-Generated Location: (1018:31,0 [1] )
+Generated Location: (871:23,0 [1] )
 |s|
 
 Source Location: (84:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -13,7 +8,7 @@ Source Location: (84:2,7 [73] x:\dir\subdir\Test\TestComponent.cshtml)
     private string s = "abc";
     private void Changed(string s) { }
 |
-Generated Location: (1466:43,0 [73] )
+Generated Location: (1319:35,0 [73] )
 |
     private string s = "abc";
     private void Changed(string s) { }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Multiple/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Multiple/TestComponent.codegen.cs
index c64aa4d9f72..8a15e19fa41 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Multiple/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Multiple/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,25) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Multiple/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Multiple/TestComponent.mappings.txt
index 2365d212b4b..70756d5b4e6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Multiple/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ImplicitStringConversion_ParameterCasing_Multiple/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |PlaceHolder|
-Generated Location: (1031:31,0 [11] )
+Generated Location: (884:23,0 [11] )
 |Placeholder|
 
 Source Location: (28:0,28 [13] x:\dir\subdir\Test\TestComponent.cshtml)
 |new MyClass()|
-Generated Location: (1298:39,0 [13] )
+Generated Location: (1151:31,0 [13] )
 |new MyClass()|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InvalidCode_EmptyTransition/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InvalidCode_EmptyTransition/TestComponent.codegen.cs
index a53deb4bf58..ccfa2d45762 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InvalidCode_EmptyTransition/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InvalidCode_EmptyTransition/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             __builder.AddComponentParameter(1, "Value", "Hello");
             __builder.CloseComponent();
             __builder.AddMarkupContent(2, "\r\n\r\n");
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InvalidCode_EmptyTransition/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InvalidCode_EmptyTransition/TestComponent.mappings.txt
index 755cb557323..9fd658c338a 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InvalidCode_EmptyTransition/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/InvalidCode_EmptyTransition/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (36:2,1 [0] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (36:2,1 [0] x:\dir\subdir\Test\TestComponent.cshtml)
 ||
-Generated Location: (1141:33,24 [0] )
+Generated Location: (994:25,24 [0] )
 ||
 
 Source Location: (47:4,7 [50] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     [Parameter] public int Param { get; set; }
 |
-Generated Location: (1338:43,0 [50] )
+Generated Location: (1191:35,0 [50] )
 |
     [Parameter] public int Param { get; set; }
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index e1317337afa..bb69407f7db 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,20) "x:\dir\subdir\Test\TestComponent.cshtml"
-SomeOtherComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.SomeOtherComponent>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.OpenElement(2, "h1");
                 __builder2.AddContent(3, "Child content at ");
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt
index 224a441c652..582141bcaa6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
-|SomeOtherComponent|
-Generated Location: (786:22,0 [18] )
-|SomeOtherComponent|
-
-Source Location: (48:1,26 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (48:1,26 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |DateTime.Now|
-Generated Location: (1229:33,25 [12] )
+Generated Location: (1082:25,25 [12] )
 |DateTime.Now|
 
 Source Location: (81:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"good"|
-Generated Location: (1629:45,25 [6] )
+Generated Location: (1482:37,25 [6] )
 |"good"|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 11b41996f4a..48e23e568ee 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,20) "x:\dir\subdir\Test\TestComponent.cshtml"
-SomeOtherComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.SomeOtherComponent>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddMarkupContent(2, "\r\n    ");
                 __builder2.OpenElement(3, "h1");
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt
index 4f54b4945cd..733b264e120 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt
@@ -1,15 +1,10 @@
-Source Location: (1:0,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
-|SomeOtherComponent|
-Generated Location: (786:22,0 [18] )
-|SomeOtherComponent|
-
-Source Location: (48:1,26 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (48:1,26 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |DateTime.Now|
-Generated Location: (1290:34,25 [12] )
+Generated Location: (1143:26,25 [12] )
 |DateTime.Now|
 
 Source Location: (81:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"good"|
-Generated Location: (1690:46,25 [6] )
+Generated Location: (1543:38,25 [6] )
 |"good"|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 976a94d9490..cfcc9ab8460 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -18,15 +18,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,20) "x:\dir\subdir\Test\TestComponent.cshtml"
-SomeOtherComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::Test.SomeOtherComponent>(1);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt
deleted file mode 100644
index 112cf30a94d..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Legacy_3_1_TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (19:2,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
-|SomeOtherComponent|
-Generated Location: (856:23,0 [18] )
-|SomeOtherComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
index ab6d4faa9fb..99c684dc8f1 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddAttribute(1, "Header", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(2, "Hi!");
             }
@@ -36,15 +28,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             ));
             __builder.CloseComponent();
             __builder.AddMarkupContent(5, "\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (5,2)-(5,8) "x:\dir\subdir\Test\TestComponent.cshtml"
-Header
-
-#line default
-#line hidden
-#nullable disable
-            >(6);
+            __builder.OpenComponent<global::Test.Header>(6);
             __builder.AddAttribute(7, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(8, "Hello!");
             }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.mappings.txt
deleted file mode 100644
index e83756ecc4a..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleChildContentMatchingComponentName/TestComponent.mappings.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (81:4,1 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-|Header|
-Generated Location: (1505:41,0 [6] )
-|Header|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
index 4bf94bc5fd2..747b9d83f75 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddAttribute(1, "Header", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(2, "Hi!");
             }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
index 2589380bd08..0dd7d436906 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MultipleExplictChildContent/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (55:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
 |"bye!"|
-Generated Location: (1308:35,25 [6] )
+Generated Location: (1161:27,25 [6] )
 |"bye!"|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NamespaceWithSurrogatePair/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NamespaceWithSurrogatePair/TestComponent.codegen.cs
index e253d52139e..96a4dd938f3 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NamespaceWithSurrogatePair/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NamespaceWithSurrogatePair/TestComponent.codegen.cs
@@ -18,15 +18,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddMarkupContent(0, "<h1>Generated</h1>\r\n");
-            __builder.OpenComponent<global::test_namespace.
-#nullable restore
-#line (2,2)-(2,12) "x:\dir\subdir\Test\TestComponent.cshtml"
-Component1
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::test_namespace.Component1>(1);
             __builder.CloseComponent();
             __builder.AddMarkupContent(2, "\r\n");
             __builder.OpenElement(3, "Shared.Component2");
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NamespaceWithSurrogatePair/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NamespaceWithSurrogatePair/TestComponent.mappings.txt
deleted file mode 100644
index da5cee09e68..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NamespaceWithSurrogatePair/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (21:1,1 [10] x:\dir\subdir\Test\TestComponent.cshtml)
-|Component1|
-Generated Location: (876:23,0 [10] )
-|Component1|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
index 4024d3571a0..533b668a77c 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.MyComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.MyComponent.
 #nullable restore
 #line (1,14)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
index eefd8b361cc..a358475d932 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/NonGenericComponent_WithGenericEventHandler/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (786:22,0 [11] )
-|MyComponent|
-
-Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (13:0,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Item|
-Generated Location: (1031:31,0 [4] )
+Generated Location: (884:23,0 [4] )
 |Item|
 
 Source Location: (64:2,7 [39] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public void MyEventHandler() {}
 |
-Generated Location: (1361:43,0 [39] )
+Generated Location: (1214:35,0 [39] )
 |
     public void MyEventHandler() {}
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
index 0b2b1bb75dd..505b490577d 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.codegen.cs
@@ -55,15 +55,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(5);
+            __builder.OpenComponent<global::Test.MyComponent>(5);
             __builder.AddComponentParameter(6, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,14)-(2,22) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
index 5c373b9dd7f..8c257869b9b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_AsComponentParameter_MixedContent/TestComponent.mappings.txt
@@ -18,18 +18,13 @@ Source Location: (107:0,107 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1565:51,0 [2] )
 |; |
 
-Source Location: (113:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1753:60,0 [11] )
-|MyComponent|
-
 Source Location: (125:1,13 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |Template|
-Generated Location: (1998:69,0 [8] )
+Generated Location: (1851:61,0 [8] )
 |Template|
 
 Source Location: (136:1,24 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (2236:77,0 [8] )
+Generated Location: (2089:69,0 [8] )
 |template|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
index 84e28452f39..9848d53dfa7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 
             (__builder2) => {
                 __builder2.OpenElement(0, "div");
-                __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (2,51)-(2,62) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-                >(1);
+                __builder2.OpenComponent<global::Test.MyComponent>(1);
                 __builder2.AddComponentParameter(2, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,63)-(2,67) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
index 68d8a2b0ee9..63a212472e1 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_ContainsComponent/TestComponent.mappings.txt
@@ -5,25 +5,20 @@ Generated Location: (735:21,0 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
-Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1054:33,0 [11] )
-|MyComponent|
-
 Source Location: (66:1,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Name|
-Generated Location: (1308:42,0 [4] )
+Generated Location: (1156:34,0 [4] )
 |Name|
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1572:50,0 [11] )
+Generated Location: (1420:42,0 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1842:61,0 [3] )
+Generated Location: (1690:53,0 [3] )
 |;
 |
 
@@ -34,7 +29,7 @@ Source Location: (106:3,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2026:71,0 [76] )
+Generated Location: (1874:63,0 [76] )
 |
     class Person
     {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index c34befc1eaa..bcfcb499c0b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 
             (__builder2) => {
                 __builder2.OpenElement(0, "div");
-                __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (2,51)-(2,62) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-                >(1);
+                __builder2.OpenComponent<global::Test.MyComponent>(1);
                 __builder2.AddComponentParameter(2, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,63)-(2,67) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -65,15 +57,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (4,2)-(4,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Test.MyComponent>(3);
             __builder.AddAttribute(4, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
 #nullable restore
 #line (5,3)-(5,18) 25 "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index 4b8e5bdd8fc..a09e678c6ac 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -5,36 +5,26 @@ Generated Location: (735:21,0 [45] )
 |
     RenderFragment<Person> p = (person) => |
 
-Source Location: (54:1,50 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1054:33,0 [11] )
-|MyComponent|
-
 Source Location: (66:1,62 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |Name|
-Generated Location: (1308:42,0 [4] )
+Generated Location: (1156:34,0 [4] )
 |Name|
 
 Source Location: (73:1,69 [11] x:\dir\subdir\Test\TestComponent.cshtml)
 |person.Name|
-Generated Location: (1572:50,0 [11] )
+Generated Location: (1420:42,0 [11] )
 |person.Name|
 
 Source Location: (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1842:61,0 [3] )
+Generated Location: (1690:53,0 [3] )
 |;
 |
 
-Source Location: (100:3,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (2029:70,0 [11] )
-|MyComponent|
-
 Source Location: (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |"hello, world!"|
-Generated Location: (2350:79,25 [15] )
+Generated Location: (2051:63,25 [15] )
 |"hello, world!"|
 
 Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -44,7 +34,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2640:92,0 [76] )
+Generated Location: (2341:76,0 [76] )
 |
     class Person
     {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
index df1a284aec4..3a1cc0b38ca 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.codegen.cs
@@ -45,15 +45,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(2);
+            __builder.OpenComponent<global::Test.MyComponent>(2);
             __builder.AddComponentParameter(3, nameof(global::Test.MyComponent.
 #nullable restore
 #line (2,14)-(2,28) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
index 6143449b05c..2179ff2f540 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_Generic_AsComponentParameter/TestComponent.mappings.txt
@@ -13,18 +13,13 @@ Source Location: (73:0,73 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1252:41,0 [2] )
 |; |
 
-Source Location: (79:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1440:50,0 [11] )
-|MyComponent|
-
 Source Location: (91:1,13 [14] x:\dir\subdir\Test\TestComponent.cshtml)
 |PersonTemplate|
-Generated Location: (1685:59,0 [14] )
+Generated Location: (1538:51,0 [14] )
 |PersonTemplate|
 
 Source Location: (108:1,30 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1928:67,0 [8] )
+Generated Location: (1781:59,0 [8] )
 |template|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
index ed0177bba1c..2af1e18a01e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.codegen.cs
@@ -36,15 +36,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,13) "x:\dir\subdir\Test\TestComponent.cshtml"
-MyComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::Test.MyComponent>(1);
             __builder.AddComponentParameter(2, "Person", 
 #nullable restore
 #line (2,23)-(2,31) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
index 9dba87ffa18..31a8715d912 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_NonGeneric_AsComponentParameter/TestComponent.mappings.txt
@@ -8,13 +8,8 @@ Source Location: (45:0,45 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 Generated Location: (1012:32,0 [2] )
 |; |
 
-Source Location: (51:1,1 [11] x:\dir\subdir\Test\TestComponent.cshtml)
-|MyComponent|
-Generated Location: (1200:41,0 [11] )
-|MyComponent|
-
 Source Location: (72:1,22 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |template|
-Generated Location: (1423:50,0 [8] )
+Generated Location: (1276:42,0 [8] )
 |template|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
index 4286be99033..5f776acf9a8 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,9) "x:\dir\subdir\Test\TestComponent.cshtml"
-Counter
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.Counter>(0);
             __builder.AddComponentParameter(1, "v", 
 #nullable restore
 #line (1,19)-(1,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
index 7b450feec0d..6f29ef98852 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_597/TestComponent.mappings.txt
@@ -1,18 +1,13 @@
-Source Location: (1:0,1 [7] x:\dir\subdir\Test\TestComponent.cshtml)
-|Counter|
-Generated Location: (785:22,0 [7] )
-|Counter|
-
-Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (18:0,18 [1] x:\dir\subdir\Test\TestComponent.cshtml)
 |y|
-Generated Location: (999:31,0 [1] )
+Generated Location: (853:23,0 [1] )
 |y|
 
 Source Location: (32:1,7 [24] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     string y = null;
 |
-Generated Location: (1433:43,0 [24] )
+Generated Location: (1287:35,0 [24] )
 |
     string y = null;
 |
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
index 73680562d72..16fc5b33298 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,6) "x:\dir\subdir\Test\TestComponent.cshtml"
-User
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.User>(0);
             __builder.AddComponentParameter(1, "Name", 
 #nullable restore
 #line (1,20)-(1,28) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
index 397027fb22b..d787010f724 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_609/TestComponent.mappings.txt
@@ -1,16 +1,11 @@
-Source Location: (1:0,1 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-|User|
-Generated Location: (785:22,0 [4] )
-|User|
-
-Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserName|
-Generated Location: (999:31,0 [8] )
+Generated Location: (853:23,0 [8] )
 |UserName|
 
 Source Location: (46:0,46 [12] x:\dir\subdir\Test\TestComponent.cshtml)
 |UserIsActive|
-Generated Location: (1430:41,0 [12] )
+Generated Location: (1284:33,0 [12] )
 |UserIsActive|
 
 Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -18,7 +13,7 @@ Source Location: (73:2,7 [88] x:\dir\subdir\Test\TestComponent.cshtml)
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
 |
-Generated Location: (1904:53,0 [88] )
+Generated Location: (1758:45,0 [88] )
 |
     public string UserName { get; set; }
     public bool UserIsActive { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
index 9991b35259b..1d8ac4b40fc 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,2)-(7,14) "x:\dir\subdir\Test\TestComponent.cshtml"
-SurveyPrompt
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::Test.SurveyPrompt>(1);
             __builder.AddComponentParameter(2, nameof(global::Test.SurveyPrompt.
 #nullable restore
 #line (7,15)-(7,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
index c6fd9bb4ddc..62a314b52ff 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_772/TestComponent.mappings.txt
@@ -3,13 +3,8 @@
 Generated Location: (504:16,0 [3] )
 |"/"|
 
-Source Location: (68:6,1 [12] x:\dir\subdir\Test\TestComponent.cshtml)
-|SurveyPrompt|
-Generated Location: (1135:33,0 [12] )
-|SurveyPrompt|
-
 Source Location: (81:6,14 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Title|
-Generated Location: (1382:42,0 [5] )
+Generated Location: (1235:34,0 [5] )
 |Title|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
index 13e0e779c2f..7ca461550e5 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.codegen.cs
@@ -28,15 +28,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddMarkupContent(0, "<h1>Hello, world!</h1>\r\n\r\nWelcome to your new app.\r\n\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (7,2)-(7,14) "x:\dir\subdir\Test\TestComponent.cshtml"
-SurveyPrompt
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::Test.SurveyPrompt>(1);
             __builder.AddComponentParameter(2, nameof(global::Test.SurveyPrompt.
 #nullable restore
 #line (7,15)-(7,20) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
index c6fd9bb4ddc..62a314b52ff 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Regression_773/TestComponent.mappings.txt
@@ -3,13 +3,8 @@
 Generated Location: (504:16,0 [3] )
 |"/"|
 
-Source Location: (68:6,1 [12] x:\dir\subdir\Test\TestComponent.cshtml)
-|SurveyPrompt|
-Generated Location: (1135:33,0 [12] )
-|SurveyPrompt|
-
 Source Location: (81:6,14 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |Title|
-Generated Location: (1382:42,0 [5] )
+Generated Location: (1235:34,0 [5] )
 |Title|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Existing_Attributes/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Existing_Attributes/TestComponent.codegen.cs
index b0766890ff0..444c83c334e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Existing_Attributes/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Existing_Attributes/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             __builder.AddComponentParameter(1, nameof(global::Test.TestComponent.
 #nullable restore
 #line (1,16)-(1,18) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Existing_Attributes/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Existing_Attributes/TestComponent.mappings.txt
index e5f51deea52..d04dd17a216 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Existing_Attributes/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Existing_Attributes/TestComponent.mappings.txt
@@ -1,21 +1,16 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (15:0,15 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |P2|
-Generated Location: (1035:31,0 [2] )
+Generated Location: (888:23,0 [2] )
 |P2|
 
 Source Location: (37:0,37 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (1286:40,0 [64] )
+Generated Location: (1139:32,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
 Source Location: (103:0,103 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |P1|
-Generated Location: (1586:50,0 [2] )
+Generated Location: (1439:42,0 [2] )
 |P1|
 
 Source Location: (126:3,1 [94] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -24,7 +19,7 @@ Source Location: (126:3,1 [94] x:\dir\subdir\Test\TestComponent.cshtml)
 
     [Parameter]public string P2 {get; set;}
 |
-Generated Location: (1895:62,0 [94] )
+Generated Location: (1748:54,0 [94] )
 |
     [Parameter]public string P1 {get; set;}
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Expression/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Expression/TestComponent.codegen.cs
index bdab834d2ca..d8e81118247 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Expression/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Expression/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode = 
 #nullable restore
 #line (1,31)-(1,69) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Expression/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Expression/TestComponent.mappings.txt
index 6b2c7803135..c027541242f 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Expression/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_Expression/TestComponent.mappings.txt
@@ -1,11 +1,6 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (30:0,30 [38] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [38] x:\dir\subdir\Test\TestComponent.cshtml)
 |new MyRenderMode() { Extra = "Hello" }|
-Generated Location: (1042:31,0 [38] )
+Generated Location: (895:23,0 [38] )
 |new MyRenderMode() { Extra = "Hello" }|
 
 Source Location: (83:2,1 [135] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -15,7 +10,7 @@ Source Location: (83:2,1 [135] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Extra {get;set;}
     }
 |
-Generated Location: (1380:44,0 [135] )
+Generated Location: (1233:36,0 [135] )
 |
     class MyRenderMode : Microsoft.AspNetCore.Components.IComponentRenderMode
     {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_SimpleIdentifier/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_SimpleIdentifier/TestComponent.codegen.cs
index a4285e51ec5..f8b9b04d295 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_SimpleIdentifier/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_SimpleIdentifier/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode = 
 #nullable restore
 #line (1,29)-(1,93) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_SimpleIdentifier/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_SimpleIdentifier/TestComponent.mappings.txt
index fe354caf298..93432e31893 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_SimpleIdentifier/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Attribute_With_SimpleIdentifier/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (28:0,28 [64] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (1042:31,0 [64] )
+Generated Location: (895:23,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Child_Components/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Child_Components/TestComponent.codegen.cs
index 2c289628b07..c32d2807ea7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Child_Components/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Child_Components/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode = 
 #nullable restore
 #line (1,29)-(1,93) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -37,15 +29,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 
             ;
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
-                __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (2,6)-(2,19) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-                >(2);
+                __builder2.OpenComponent<global::Test.TestComponent>(2);
                 global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode2_0 = 
 #nullable restore
 #line (2,33)-(2,97) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -57,15 +41,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 
                 ;
                 __builder2.AddAttribute(3, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder3) => {
-                    __builder3.OpenComponent<global::Test.
-#nullable restore
-#line (3,10)-(3,23) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-                    >(4);
+                    __builder3.OpenComponent<global::Test.TestComponent>(4);
                     global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode3_0 = 
 #nullable restore
 #line (3,37)-(3,101) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -83,15 +59,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
                 __builder2.AddComponentRenderMode(__renderMode2_0);
                 __builder2.CloseComponent();
                 __builder2.AddMarkupContent(5, "\r\n ");
-                __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (5,3)-(5,16) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-                >(6);
+                __builder2.OpenComponent<global::Test.TestComponent>(6);
                 global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode2_1 = 
 #nullable restore
 #line (5,30)-(5,94) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -103,15 +71,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 
                 ;
                 __builder2.AddAttribute(7, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder3) => {
-                    __builder3.OpenComponent<global::Test.
-#nullable restore
-#line (6,10)-(6,23) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-                    >(8);
+                    __builder3.OpenComponent<global::Test.TestComponent>(8);
                     global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode3_0 = 
 #nullable restore
 #line (6,37)-(6,101) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -125,15 +85,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
                     __builder3.AddComponentRenderMode(__renderMode3_0);
                     __builder3.CloseComponent();
                     __builder3.AddMarkupContent(9, "\r\n        ");
-                    __builder3.OpenComponent<global::Test.
-#nullable restore
-#line (7,10)-(7,23) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-                    >(10);
+                    __builder3.OpenComponent<global::Test.TestComponent>(10);
                     global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode3_1 = 
 #nullable restore
 #line (7,37)-(7,101) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Child_Components/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Child_Components/TestComponent.mappings.txt
index e98861bb896..77eb7b5e552 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Child_Components/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Child_Components/TestComponent.mappings.txt
@@ -1,61 +1,31 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (28:0,28 [64] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (1042:31,0 [64] )
+Generated Location: (895:23,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
-Source Location: (101:1,5 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1442:42,0 [13] )
-|TestComponent|
-
 Source Location: (128:1,32 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (1709:51,0 [64] )
+Generated Location: (1411:35,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
-Source Location: (205:2,9 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (2123:62,0 [13] )
-|TestComponent|
-
 Source Location: (232:2,36 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (2399:71,0 [64] )
+Generated Location: (1945:47,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
-Source Location: (326:4,2 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (3013:88,0 [13] )
-|TestComponent|
-
 Source Location: (353:4,29 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (3280:97,0 [64] )
+Generated Location: (2675:65,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
-Source Location: (430:5,9 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (3694:108,0 [13] )
-|TestComponent|
-
 Source Location: (457:5,36 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (3970:117,0 [64] )
+Generated Location: (3209:77,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
-Source Location: (536:6,9 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (4445:130,0 [13] )
-|TestComponent|
-
 Source Location: (563:6,36 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (4722:139,0 [64] )
+Generated Location: (3805:91,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
 Source Location: (683:11,1 [73] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -63,7 +33,7 @@ Source Location: (683:11,1 [73] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter]
     public RenderFragment ChildContent { get; set; }
 |
-Generated Location: (5406:160,0 [73] )
+Generated Location: (4489:112,0 [73] )
 |
     [Parameter]
     public RenderFragment ChildContent { get; set; }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Multiple_Components/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Multiple_Components/TestComponent.codegen.cs
index f61c2341769..a33c26b98f6 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Multiple_Components/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Multiple_Components/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode = 
 #nullable restore
 #line (1,29)-(1,93) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -39,15 +31,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
             __builder.AddComponentRenderMode(__renderMode);
             __builder.CloseComponent();
             __builder.AddMarkupContent(1, "\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (2,2)-(2,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(2);
+            __builder.OpenComponent<global::Test.TestComponent>(2);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode1_1 = 
 #nullable restore
 #line (2,29)-(2,93) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Multiple_Components/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Multiple_Components/TestComponent.mappings.txt
index d0730bd89d9..3c78aca2813 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Multiple_Components/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_Multiple_Components/TestComponent.mappings.txt
@@ -1,20 +1,10 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (28:0,28 [64] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (1042:31,0 [64] )
+Generated Location: (895:23,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
-Source Location: (99:1,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (1461:44,0 [13] )
-|TestComponent|
-
 Source Location: (126:1,28 [64] x:\dir\subdir\Test\TestComponent.cshtml)
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
-Generated Location: (1720:53,0 [64] )
+Generated Location: (1426:37,0 [64] )
 |Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Disabled/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Disabled/TestComponent.codegen.cs
index 8d63c41c9ea..87f81bf8411 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Disabled/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Disabled/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode = 
 #nullable restore
 #line (1,29)-(1,33) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Disabled/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Disabled/TestComponent.mappings.txt
index f11453b364a..6b3789ae474 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Disabled/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Disabled/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |null|
-Generated Location: (1042:31,0 [4] )
+Generated Location: (895:23,0 [4] )
 |null|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Enabled/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Enabled/TestComponent.codegen.cs
index 8d63c41c9ea..87f81bf8411 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Enabled/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Enabled/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode = 
 #nullable restore
 #line (1,29)-(1,33) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Enabled/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Enabled/TestComponent.mappings.txt
index f11453b364a..6b3789ae474 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Enabled/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Null_Nullable_Enabled/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml)
 |null|
-Generated Location: (1042:31,0 [4] )
+Generated Location: (895:23,0 [4] )
 |null|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Nullable_Receiver/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Nullable_Receiver/TestComponent.codegen.cs
index fa48695664c..f4da5978e75 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Nullable_Receiver/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Nullable_Receiver/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (10,2)-(10,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode = 
 #nullable restore
 #line (10,31)-(10,51) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Nullable_Receiver/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Nullable_Receiver/TestComponent.mappings.txt
index c72f6fe2f8d..b8fd30484dd 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Nullable_Receiver/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Nullable_Receiver/TestComponent.mappings.txt
@@ -1,11 +1,6 @@
-Source Location: (262:9,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (788:22,0 [13] )
-|TestComponent|
-
-Source Location: (291:9,30 [20] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (291:9,30 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 |Container.RenderMode|
-Generated Location: (1046:31,0 [20] )
+Generated Location: (897:23,0 [20] )
 |Container.RenderMode|
 
 Source Location: (8:1,1 [250] x:\dir\subdir\Test\TestComponent.cshtml)
@@ -17,7 +12,7 @@ Source Location: (8:1,1 [250] x:\dir\subdir\Test\TestComponent.cshtml)
 
     RenderModeContainer? Container => null;
 |
-Generated Location: (1366:44,0 [250] )
+Generated Location: (1217:36,0 [250] )
 |
     public class RenderModeContainer
     {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Ternary/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Ternary/TestComponent.codegen.cs
index 8b9ac32d7e0..0dd4348726b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Ternary/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Ternary/TestComponent.codegen.cs
@@ -17,15 +17,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (1,2)-(1,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.TestComponent>(0);
             global::Microsoft.AspNetCore.Components.IComponentRenderMode __renderMode = 
 #nullable restore
 #line (1,31)-(1,109) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Ternary/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Ternary/TestComponent.mappings.txt
index 361c94320c3..1a1c9293c01 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Ternary/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_Ternary/TestComponent.mappings.txt
@@ -1,10 +1,5 @@
-Source Location: (1:0,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (786:22,0 [13] )
-|TestComponent|
-
-Source Location: (30:0,30 [78] x:\dir\subdir\Test\TestComponent.cshtml)
+Source Location: (30:0,30 [78] x:\dir\subdir\Test\TestComponent.cshtml)
 |true ? Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer : null|
-Generated Location: (1043:31,0 [78] )
+Generated Location: (896:23,0 [78] )
 |true ? Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer : null|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_TypeInference/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_TypeInference/TestComponent.codegen.cs
index ddd11cb948e..058dc02da3e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_TypeInference/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_TypeInference/TestComponent.codegen.cs
@@ -71,15 +71,7 @@ internal static class TypeInference
         public static void CreateTestComponent_0<TRenderMode>(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder, int seq, int __seq0, Microsoft.AspNetCore.Components.IComponentRenderMode __arg0, int __seq1, TRenderMode __arg1)
             where TRenderMode : global::Microsoft.AspNetCore.Components.IComponentRenderMode
         {
-        __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,15) "x:\dir\subdir\Test\TestComponent.cshtml"
-TestComponent
-
-#line default
-#line hidden
-#nullable disable
-        <TRenderMode>>(seq);
+        __builder.OpenComponent<global::Test.TestComponent<TRenderMode>>(seq);
         __builder.AddComponentParameter(__seq1, nameof(global::Test.TestComponent<TRenderMode>.
 #nullable restore
 #line (3,46)-(3,61) "x:\dir\subdir\Test\TestComponent.cshtml"
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_TypeInference/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_TypeInference/TestComponent.mappings.txt
index 0e57c458b1e..5a28ba16584 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_TypeInference/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RenderMode_With_TypeInference/TestComponent.mappings.txt
@@ -27,13 +27,8 @@ Generated Location: (1630:56,0 [67] )
     [Parameter] public TRenderMode RenderModeParam { get; set;}
 |
 
-Source Location: (100:2,1 [13] x:\dir\subdir\Test\TestComponent.cshtml)
-|TestComponent|
-Generated Location: (2356:76,0 [13] )
-|TestComponent|
-
 Source Location: (144:2,45 [15] x:\dir\subdir\Test\TestComponent.cshtml)
 |RenderModeParam|
-Generated Location: (2630:85,0 [15] )
+Generated Location: (2487:77,0 [15] )
 |RenderModeParam|
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 976a94d9490..cfcc9ab8460 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -18,15 +18,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddMarkupContent(0, "<h1>Hello</h1>\r\n\r\n");
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,20) "x:\dir\subdir\Test\TestComponent.cshtml"
-SomeOtherComponent
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::Test.SomeOtherComponent>(1);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt
deleted file mode 100644
index 112cf30a94d..00000000000
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/TrailingWhiteSpace_WithComponent/TestComponent.mappings.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Source Location: (19:2,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
-|SomeOtherComponent|
-Generated Location: (856:23,0 [18] )
-|SomeOtherComponent|
-
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.codegen.cs
index 7d26a57f376..7a144a33d32 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.codegen.cs
@@ -22,15 +22,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,5) "x:\dir\subdir\Test\TestComponent.cshtml"
-Col
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.Col>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(2, "in markup");
             }
@@ -44,15 +36,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (5,6)-(5,9) "x:\dir\subdir\Test\TestComponent.cshtml"
-Col
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Test.Col>(3);
             __builder.CloseComponent();
 #nullable restore
 #line (5,10)-(6,31) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -64,15 +48,7 @@ in code block</Col>
 #nullable disable
 
             (__builder2) => {
-                __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (6,33)-(6,36) "x:\dir\subdir\Test\TestComponent.cshtml"
-Col
-
-#line default
-#line hidden
-#nullable disable
-                >(4);
+                __builder2.OpenComponent<global::Test.Col>(4);
                 __builder2.CloseComponent();
             }
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.mappings.txt
index 22fa2dff981..ff36719db7e 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName/TestComponent.mappings.txt
@@ -3,39 +3,24 @@
 Generated Location: (320:11,0 [37] )
 |using Microsoft.AspNetCore.Components|
 
-Source Location: (43:2,1 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-|Col|
-Generated Location: (881:27,0 [3] )
-|Col|
-
 Source Location: (66:3,2 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 |
-Generated Location: (1294:40,0 [2] )
+Generated Location: (1148:32,0 [2] )
 |
 |
 
-Source Location: (73:4,5 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-|Col|
-Generated Location: (1479:49,0 [3] )
-|Col|
-
 Source Location: (77:4,9 [51] x:\dir\subdir\Test\TestComponent.cshtml)
 |in code block</Col>
     RenderFragment template = |
-Generated Location: (1676:58,0 [51] )
+Generated Location: (1384:42,0 [51] )
 |in code block</Col>
     RenderFragment template = |
 
-Source Location: (130:5,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-|Col|
-Generated Location: (1950:69,0 [3] )
-|Col|
-
 Source Location: (134:5,36 [20] x:\dir\subdir\Test\TestComponent.cshtml)
 |in template</Col>;
 |
-Generated Location: (2170:79,0 [20] )
+Generated Location: (1726:55,0 [20] )
 |in template</Col>;
 |
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.codegen.cs
index c8327cf2d83..81318024554 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.codegen.cs
@@ -22,15 +22,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::
-#nullable restore
-#line (3,2)-(3,10) "x:\dir\subdir\Test\TestComponent.cshtml"
-Test.Col
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.Col>(0);
             __builder.AddAttribute(1, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(2, "in markup");
             }
@@ -44,15 +36,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::
-#nullable restore
-#line (5,6)-(5,14) "x:\dir\subdir\Test\TestComponent.cshtml"
-Test.Col
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Test.Col>(3);
             __builder.AddAttribute(4, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
                 __builder2.AddContent(5, "in code block");
             }
@@ -67,15 +51,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #nullable disable
 
             (__builder2) => {
-                __builder2.OpenComponent<global::
-#nullable restore
-#line (6,33)-(6,41) "x:\dir\subdir\Test\TestComponent.cshtml"
-Test.Col
-
-#line default
-#line hidden
-#nullable disable
-                >(6);
+                __builder2.OpenComponent<global::Test.Col>(6);
                 __builder2.AddAttribute(7, "ChildContent", (global::Microsoft.AspNetCore.Components.RenderFragment)((__builder3) => {
                     __builder3.AddContent(8, "in template");
                 }
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.mappings.txt
index f1aab7f5630..3e559ac80a5 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_FullyQualified/TestComponent.mappings.txt
@@ -3,37 +3,22 @@
 Generated Location: (320:11,0 [37] )
 |using Microsoft.AspNetCore.Components|
 
-Source Location: (43:2,1 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|Test.Col|
-Generated Location: (877:27,0 [8] )
-|Test.Col|
-
 Source Location: (76:3,2 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 |
-Generated Location: (1295:40,0 [2] )
+Generated Location: (1148:32,0 [2] )
 |
 |
 
-Source Location: (83:4,5 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|Test.Col|
-Generated Location: (1476:49,0 [8] )
-|Test.Col|
-
 Source Location: (118:5,0 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |    RenderFragment template = |
-Generated Location: (1899:62,0 [30] )
+Generated Location: (1605:46,0 [30] )
 |    RenderFragment template = |
 
-Source Location: (150:5,32 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-|Test.Col|
-Generated Location: (2147:72,0 [8] )
-|Test.Col|
-
 Source Location: (181:5,63 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (2609:86,0 [3] )
+Generated Location: (2163:62,0 [3] )
 |;
 |
 
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.codegen.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.codegen.cs
index 69fa6107584..648b1868f18 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.codegen.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.codegen.cs
@@ -22,15 +22,7 @@ public partial class TestComponent : global::Microsoft.AspNetCore.Components.Com
         #pragma warning disable 1998
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (3,2)-(3,5) "x:\dir\subdir\Test\TestComponent.cshtml"
-Col
-
-#line default
-#line hidden
-#nullable disable
-            >(0);
+            __builder.OpenComponent<global::Test.Col>(0);
             __builder.CloseComponent();
 #nullable restore
 #line (4,3)-(5,1) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -40,15 +32,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #line hidden
 #nullable disable
 
-            __builder.OpenComponent<global::Test.
-#nullable restore
-#line (5,6)-(5,9) "x:\dir\subdir\Test\TestComponent.cshtml"
-Col
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::Test.Col>(1);
             __builder.CloseComponent();
 #nullable restore
 #line (6,1)-(6,31) "x:\dir\subdir\Test\TestComponent.cshtml"
@@ -59,15 +43,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
 #nullable disable
 
             (__builder2) => {
-                __builder2.OpenComponent<global::Test.
-#nullable restore
-#line (6,33)-(6,36) "x:\dir\subdir\Test\TestComponent.cshtml"
-Col
-
-#line default
-#line hidden
-#nullable disable
-                >(2);
+                __builder2.OpenComponent<global::Test.Col>(2);
                 __builder2.CloseComponent();
             }
 #nullable restore
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.mappings.txt b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.mappings.txt
index 5f34b0954cf..a2fc0fa4645 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.mappings.txt
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/VoidTagName_SelfClosing/TestComponent.mappings.txt
@@ -3,37 +3,22 @@
 Generated Location: (320:11,0 [37] )
 |using Microsoft.AspNetCore.Components|
 
-Source Location: (43:2,1 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-|Col|
-Generated Location: (881:27,0 [3] )
-|Col|
-
 Source Location: (53:3,2 [2] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 |
-Generated Location: (1076:36,0 [2] )
+Generated Location: (930:28,0 [2] )
 |
 |
 
-Source Location: (60:4,5 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-|Col|
-Generated Location: (1261:45,0 [3] )
-|Col|
-
 Source Location: (68:5,0 [30] x:\dir\subdir\Test\TestComponent.cshtml)
 |    RenderFragment template = |
-Generated Location: (1457:54,0 [30] )
+Generated Location: (1165:38,0 [30] )
 |    RenderFragment template = |
 
-Source Location: (100:5,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
-|Col|
-Generated Location: (1710:64,0 [3] )
-|Col|
-
 Source Location: (106:5,38 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |;
 |
-Generated Location: (1930:74,0 [3] )
+Generated Location: (1486:50,0 [3] )
 |;
 |
 
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDesignTimeNodeWriter.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDesignTimeNodeWriter.cs
index 0314d106820..f255d39b662 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDesignTimeNodeWriter.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDesignTimeNodeWriter.cs
@@ -563,7 +563,7 @@ public override void WriteComponent(CodeRenderingContext context, ComponentInter
 
     public override void WriteComponentTypeInferenceMethod(CodeRenderingContext context, ComponentTypeInferenceMethodIntermediateNode node)
     {
-        base.WriteComponentTypeInferenceMethod(context, node, returnComponentType: true, allowNameof: false, mapComponentStartTag: false);
+        base.WriteComponentTypeInferenceMethod(context, node, returnComponentType: true, allowNameof: false);
     }
 
     private void WriteTypeInferenceMethodParameterInnards(CodeRenderingContext context, TypeInferenceMethodParameter parameter)
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentLoweringPass.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentLoweringPass.cs
index f5d9e977b8c..980e7090021 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentLoweringPass.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentLoweringPass.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
@@ -143,14 +142,12 @@ static TagHelperDescriptor GetTagHelperOrAddDiagnostic(TagHelperIntermediateNode
 
     private static ComponentIntermediateNode RewriteAsComponent(TagHelperIntermediateNode node, TagHelperDescriptor tagHelper)
     {
-        Debug.Assert(node.StartTagSpan.HasValue, "Component tags should always have a start tag span.");
         var component = new ComponentIntermediateNode()
         {
             Component = tagHelper,
             Source = node.Source,
             TagName = node.TagName,
             TypeName = tagHelper.TypeName,
-            StartTagSpan = node.StartTagSpan.AssumeNotNull(),
         };
 
         component.AddDiagnosticsFromNode(node);
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentNodeWriter.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentNodeWriter.cs
index a76cc660e5f..36219c5e611 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentNodeWriter.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentNodeWriter.cs
@@ -75,7 +75,7 @@ protected bool ShouldSuppressTypeInferenceCall(ComponentIntermediateNode node)
         return node.Diagnostics.Any(d => d.Id == ComponentDiagnosticFactory.GenericComponentTypeInferenceUnderspecified.Id);
     }
 
-    protected void WriteComponentTypeInferenceMethod(CodeRenderingContext context, ComponentTypeInferenceMethodIntermediateNode node, bool returnComponentType, bool allowNameof, bool mapComponentStartTag)
+    protected void WriteComponentTypeInferenceMethod(CodeRenderingContext context, ComponentTypeInferenceMethodIntermediateNode node, bool returnComponentType, bool allowNameof)
     {
         if (context == null)
         {
@@ -166,18 +166,7 @@ protected void WriteComponentTypeInferenceMethod(CodeRenderingContext context, C
         context.CodeWriter.Write(".");
         context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent);
         context.CodeWriter.Write("<");
-
-        if (mapComponentStartTag)
-        {
-            var nonGenericTypeName = TypeNameHelper.GetNonGenericTypeName(node.Component.TypeName, out var genericTypeParameterList);
-            WriteComponentTypeName(context, node.Component, nonGenericTypeName);
-            context.CodeWriter.Write(genericTypeParameterList);
-        }
-        else
-        {
-            context.CodeWriter.Write(node.Component.TypeName);
-        }
-
+        context.CodeWriter.Write(node.Component.TypeName);
         context.CodeWriter.Write(">(");
         context.CodeWriter.Write("seq");
         context.CodeWriter.Write(");");
@@ -541,42 +530,6 @@ protected static void WriteGloballyQualifiedTypeName(CodeRenderingContext contex
         }
     }
 
-    protected static void WriteComponentTypeName(CodeRenderingContext context, ComponentIntermediateNode node, ReadOnlyMemory<char> nonGenericTypeName)
-    {
-        // The type name we are given may or may not be globally qualified, and we want to map it to the component start
-        // tag, which may or may not be fully qualified. ie "global::My.Fun.Component" could map to just "Component"
-
-        // Write out "global::" if it's present, and trim it off
-        var lastColon = nonGenericTypeName.Span.LastIndexOf(':');
-        if (lastColon > -1)
-        {
-            lastColon++;
-            context.CodeWriter.Write(nonGenericTypeName[0..lastColon]);
-            nonGenericTypeName = nonGenericTypeName.Slice(lastColon);
-        }
-
-        // If the start tag is shorter than the type name, then it must not be a fully qualified tag, so write out
-        // the namespace parts and trim. Razor components don't support nested types, so this logic doesn't either.
-        if (node.StartTagSpan.Length < nonGenericTypeName.Length)
-        {
-            var lastDot = nonGenericTypeName.Span.LastIndexOf('.');
-            if (lastDot > -1)
-            {
-                lastDot++;
-                context.CodeWriter.Write(nonGenericTypeName[0..lastDot]);
-                nonGenericTypeName = nonGenericTypeName.Slice(lastDot);
-            }
-        }
-
-        var offset = nonGenericTypeName.Span.StartsWith('@')
-            ? 1
-            : 0;
-        using (context.BuildEnhancedLinePragma(node.StartTagSpan, offset))
-        {
-            context.CodeWriter.Write(nonGenericTypeName);
-        }
-    }
-
     [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
     protected internal readonly struct SeqName(int index) : IWriteableValue
     {
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentRuntimeNodeWriter.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentRuntimeNodeWriter.cs
index 0e3bda3dce5..ddcaf605493 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentRuntimeNodeWriter.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentRuntimeNodeWriter.cs
@@ -378,10 +378,7 @@ public override void WriteComponent(CodeRenderingContext context, ComponentInter
             context.CodeWriter.Write(ComponentsApi.RenderTreeBuilder.OpenComponent);
             context.CodeWriter.Write("<");
 
-            var nonGenericTypeName = TypeNameHelper.GetNonGenericTypeName(node.TypeName, out _);
-            TypeNameHelper.WriteGlobalPrefixIfNeeded(context.CodeWriter, nonGenericTypeName);
-            WriteComponentTypeName(context, node, nonGenericTypeName);
-
+            TypeNameHelper.WriteGloballyQualifiedName(context.CodeWriter, TypeNameHelper.GetNonGenericTypeName(node.TypeName));
             if (!node.OrderedTypeArguments.IsDefaultOrEmpty)
             {
                 context.CodeWriter.Write("<");
@@ -543,7 +540,7 @@ public override void WriteComponent(CodeRenderingContext context, ComponentInter
 
     public override void WriteComponentTypeInferenceMethod(CodeRenderingContext context, ComponentTypeInferenceMethodIntermediateNode node)
     {
-        WriteComponentTypeInferenceMethod(context, node, returnComponentType: false, allowNameof: true, mapComponentStartTag: true);
+        WriteComponentTypeInferenceMethod(context, node, returnComponentType: false, allowNameof: true);
     }
 
     private void WriteTypeInferenceMethodParameterInnards(CodeRenderingContext context, TypeInferenceMethodParameter parameter)
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/TypeNameHelper.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/TypeNameHelper.cs
index 02a6272f535..1bd340bf448 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/TypeNameHelper.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/TypeNameHelper.cs
@@ -79,15 +79,6 @@ public static void WriteGloballyQualifiedName(CodeWriter codeWriter, string type
     }
 
     internal static void WriteGloballyQualifiedName(CodeWriter codeWriter, ReadOnlyMemory<char> typeName)
-    {
-        WriteGlobalPrefixIfNeeded(codeWriter, typeName);
-        codeWriter.Write(typeName);
-    }
-
-    /// <summary>
-    /// Writes "global::" if the typename doesn't already start with it and isn't a predefined type.
-    /// </summary>
-    internal static void WriteGlobalPrefixIfNeeded(CodeWriter codeWriter, ReadOnlyMemory<char> typeName)
     {
         if (typeName.Length == 0)
         {
@@ -98,6 +89,7 @@ internal static void WriteGlobalPrefixIfNeeded(CodeWriter codeWriter, ReadOnlyMe
 
         if (typeNameSpan.StartsWith(GlobalPrefix.AsSpan(), StringComparison.Ordinal))
         {
+            codeWriter.Write(typeName);
             return;
         }
 
@@ -106,6 +98,7 @@ internal static void WriteGlobalPrefixIfNeeded(CodeWriter codeWriter, ReadOnlyMe
         // just skip prefixing tuples.
         if (typeNameSpan[0] == '(')
         {
+            codeWriter.Write(typeName);
             return;
         }
 
@@ -114,25 +107,24 @@ internal static void WriteGlobalPrefixIfNeeded(CodeWriter codeWriter, ReadOnlyMe
         if (typeNameSpan.Length < 3 || typeNameSpan.Length > 7)
         {
             codeWriter.Write(GlobalPrefix);
+            codeWriter.Write(typeName);
             return;
         }
 
         if (PredefinedTypeNames.Contains(typeName))
         {
+            codeWriter.Write(typeName);
             return;
         }
 
         codeWriter.Write(GlobalPrefix);
+        codeWriter.Write(typeName);
     }
 
-    internal static ReadOnlyMemory<char> GetNonGenericTypeName(string typeName, out ReadOnlyMemory<char> genericTypeParameterList)
+    internal static ReadOnlyMemory<char> GetNonGenericTypeName(string typeName)
     {
         var memory = typeName.AsMemory();
         var index = memory.Span.IndexOf('<');
-
-        genericTypeParameterList = index == -1
-            ? default
-            : memory[index..];
         return index == -1 ? memory : memory[..index];
     }
 }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorIntermediateNodeLoweringPhase.cs
index d9a9aaaf626..b9597b7bb54 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorIntermediateNodeLoweringPhase.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/DefaultRazorIntermediateNodeLoweringPhase.cs
@@ -1753,8 +1753,7 @@ public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax no
                 TagName = tagName,
                 TagMode = info.TagMode,
                 Source = BuildSourceSpanFromNode(node),
-                TagHelpers = info.BindingResult.Descriptors,
-                StartTagSpan = node.StartTag.Name.GetSourceSpan(SourceDocument)
+                TagHelpers = info.BindingResult.Descriptors
             };
 
             if (node.StartTag != null &&
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/ComponentIntermediateNode.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/ComponentIntermediateNode.cs
index 3cbecb7af99..30793a7b464 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/ComponentIntermediateNode.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/ComponentIntermediateNode.cs
@@ -49,8 +49,6 @@ public sealed class ComponentIntermediateNode : IntermediateNode
 
     public string TypeName { get; set; }
 
-    public SourceSpan StartTagSpan { get; init; }
-
     public override void Accept(IntermediateNodeVisitor visitor)
     {
         if (visitor == null)
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/TagHelperIntermediateNode.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/TagHelperIntermediateNode.cs
index ce69f80f4ed..f957e6a0869 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/TagHelperIntermediateNode.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Intermediate/TagHelperIntermediateNode.cs
@@ -11,11 +11,6 @@ public sealed class TagHelperIntermediateNode : IntermediateNode
     public required TagMode TagMode { get; init; }
     public required string TagName { get; init; }
 
-    /// <summary>
-    /// The source span of the start tag of the component that this tag helper represents, or null for an Mvc tag helper
-    /// </summary>
-    public SourceSpan? StartTagSpan { get; init; }
-
     public ImmutableArray<TagHelperDescriptor> TagHelpers { get; init => field = value.NullToEmpty(); } = [];
 
     public override IntermediateNodeCollection Children { get => field ??= []; }
diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs
index 460b5cdf6d6..8c78aaec0db 100644
--- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs
+++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs
@@ -1145,14 +1145,7 @@ public partial class Index : global::Microsoft.AspNetCore.Components.ComponentBa
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddMarkupContent(0, ""<h1>Hello world</h1>\r\n"");
-            __builder.OpenComponent<global::SurveyPromptRootNamspace.
-#nullable restore
-#line (4,2)-(4,14) ""Pages/Index.razor""
-SurveyPrompt
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::SurveyPromptRootNamspace.SurveyPrompt>(1);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/EmptyRootNamespace/Component3_razor.g.cs b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/EmptyRootNamespace/Component3_razor.g.cs
index 2c80d2d52a9..86097fd0f14 100644
--- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/EmptyRootNamespace/Component3_razor.g.cs
+++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/EmptyRootNamespace/Component3_razor.g.cs
@@ -18,15 +18,7 @@ public partial class Component3 : global::Microsoft.AspNetCore.Components.Compon
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddMarkupContent(0, "Component3 in global namespace\r\n");
-            __builder.OpenComponent<global::
-#nullable restore
-#line (2,2)-(2,19) "Component3.razor"
-Shared.Component1
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::Shared.Component1>(1);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/EmptyRootNamespace/Shared_Component1_razor.g.cs b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/EmptyRootNamespace/Shared_Component1_razor.g.cs
index 2f69b0ea82e..50c24cb9cf4 100644
--- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/EmptyRootNamespace/Shared_Component1_razor.g.cs
+++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/TestFiles/RazorSourceGeneratorComponentTests/EmptyRootNamespace/Shared_Component1_razor.g.cs
@@ -19,26 +19,10 @@ public partial class Component1 : global::Microsoft.AspNetCore.Components.Compon
         protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddMarkupContent(0, "Component1 in Shared namespace\r\n");
-            __builder.OpenComponent<global::
-#nullable restore
-#line (2,2)-(2,12) "Shared/Component1.razor"
-Component2
-
-#line default
-#line hidden
-#nullable disable
-            >(1);
+            __builder.OpenComponent<global::Component2>(1);
             __builder.CloseComponent();
             __builder.AddMarkupContent(2, "\r\n");
-            __builder.OpenComponent<global::
-#nullable restore
-#line (3,2)-(3,12) "Shared/Component1.razor"
-Component4
-
-#line default
-#line hidden
-#nullable disable
-            >(3);
+            __builder.OpenComponent<global::Component4>(3);
             __builder.CloseComponent();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs
index 90939d431ae..93291a2bf9f 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs
@@ -900,11 +900,6 @@ private static bool ShouldFormat(FormattingContext context, TextSpan mappingSpan
             return false;
         }
 
-        if (IsComponentStartTagName())
-        {
-            return false;
-        }
-
         if (IsInHtmlAttributeValue())
         {
             return false;
@@ -1009,19 +1004,6 @@ bool IsInBoundComponentAttributeName()
             } && !options.IsLineRequest;
         }
 
-        bool IsComponentStartTagName()
-        {
-            // E.g, (| is position)
-            //
-            // `<|Component>` - true
-            //
-            // As above, we map component elements, so GTD and FAR works, there could be C# mapping for them.
-            // We don't want the mapping to make the formatting engine think it needs to apply C# indentation rules.
-
-            return owner is MarkupTagHelperStartTagSyntax startTag &&
-                startTag.Name.Span.Contains(mappingSpan.Start);
-        }
-
         bool IsInHtmlAttributeValue()
         {
             // E.g, (| is position)
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/GoToDefinition/AbstractDefinitionService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/GoToDefinition/AbstractDefinitionService.cs
index 9bc30d397c3..e1e682bd152 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/GoToDefinition/AbstractDefinitionService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/GoToDefinition/AbstractDefinitionService.cs
@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
 using CSharpSyntaxKind = Microsoft.CodeAnalysis.CSharp.SyntaxKind;
@@ -34,6 +35,13 @@ internal abstract class AbstractDefinitionService(
         bool includeMvcTagHelpers,
         CancellationToken cancellationToken)
     {
+
+        // If we're in C# then there is no point checking for a component tag, because there won't be one
+        if (positionInfo.LanguageKind == RazorLanguageKind.CSharp)
+        {
+            return null;
+        }
+
         if (!includeMvcTagHelpers && !documentSnapshot.FileKind.IsComponent())
         {
             _logger.LogInformation($"'{documentSnapshot.FileKind}' is not a component type.");
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/AbstractRazorSemanticTokensInfoService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/AbstractRazorSemanticTokensInfoService.cs
index d2753817fc1..91bd9a4bad6 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/AbstractRazorSemanticTokensInfoService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/AbstractRazorSemanticTokensInfoService.cs
@@ -188,7 +188,7 @@ private void AddAdditionalCSharpWhitespaceRanges(List<SemanticRange> razorRanges
             ContainsOnlySpacesOrTabs(razorSource, previousSpanEndIndex + 1, startChar - previousRange.End.Character - 1))
         {
             // we're on the same line as previous, lets extend ours to include whitespace between us and the proceeding range
-            razorRanges.Add(new SemanticRange(textClassification, startLine, previousRange.End.Character, startLine, startChar, _semanticTokensLegendService.TokenModifiers.RazorCodeModifier, fromRazor: false, isCSharpWhitespace: true));
+            razorRanges.Add(new SemanticRange(textClassification, startLine, previousRange.End.Character, startLine, startChar, _semanticTokensLegendService.TokenModifiers.RazorCodeModifier, fromRazor: false));
         }
         else if (startChar > 0 &&
             previousRazorSemanticRange?.End.Line != startLine &&
@@ -196,7 +196,7 @@ private void AddAdditionalCSharpWhitespaceRanges(List<SemanticRange> razorRanges
             ContainsOnlySpacesOrTabs(razorSource, originalRangeStartIndex - startChar + 1, startChar - 1))
         {
             // We're on a new line, and the start of the line is only whitespace, so give that a background color too
-            razorRanges.Add(new SemanticRange(textClassification, startLine, 0, startLine, startChar, _semanticTokensLegendService.TokenModifiers.RazorCodeModifier, fromRazor: false, isCSharpWhitespace: true));
+            razorRanges.Add(new SemanticRange(textClassification, startLine, 0, startLine, startChar, _semanticTokensLegendService.TokenModifiers.RazorCodeModifier, fromRazor: false));
         }
     }
 
@@ -297,10 +297,10 @@ private static int[] ConvertSemanticRangesToSemanticTokensData(
             if (TryWriteToken(range, previousRange, isFirstRange, sourceText, tokens.AsSpan(index, TokenSize)))
             {
                 index += TokenSize;
-                previousRange = range;
             }
 
             isFirstRange = false;
+            previousRange = range;
         }
 
         // The common case is that the ConvertIntoDataArray calls didn't find any overlap, and we can just directly use the
@@ -363,16 +363,6 @@ static bool TryWriteToken(
                 deltaStart = currentRange.StartCharacter;
             }
 
-            // If this is a C# whitespace range, and the previous range is on the same line, and from Razor
-            // then we don't want to emit this. This happens when we have leftover whitespace from between
-            // two C# ranges, that were superseded by Razor ranges.
-            if (currentRange.IsCSharpWhitespace &&
-                previousRange.FromRazor &&
-                currentRange.StartLine == previousRange.EndLine)
-            {
-                return false;
-            }
-
             destination[0] = deltaLine;
             destination[1] = deltaStart;
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/SemanticRange.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/SemanticRange.cs
index a5b84c35a4d..7208b71dbd7 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/SemanticRange.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/SemanticRange.cs
@@ -8,7 +8,7 @@ namespace Microsoft.CodeAnalysis.Razor.SemanticTokens;
 
 internal readonly struct SemanticRange : IComparable<SemanticRange>
 {
-    public SemanticRange(int kind, int startLine, int startCharacter, int endLine, int endCharacter, int modifier, bool fromRazor, bool isCSharpWhitespace)
+    public SemanticRange(int kind, int startLine, int startCharacter, int endLine, int endCharacter, int modifier, bool fromRazor)
     {
         Kind = kind;
         StartLine = startLine;
@@ -17,7 +17,6 @@ public SemanticRange(int kind, int startLine, int startCharacter, int endLine, i
         EndCharacter = endCharacter;
         Modifier = modifier;
         FromRazor = fromRazor;
-        IsCSharpWhitespace = isCSharpWhitespace;
     }
 
     public SemanticRange(int kind, LinePositionSpan range, int modifier, bool fromRazor)
@@ -26,12 +25,7 @@ public SemanticRange(int kind, LinePositionSpan range, int modifier, bool fromRa
     }
 
     public SemanticRange(int kind, LinePosition start, LinePosition end, int modifier, bool fromRazor)
-        : this(kind, start.Line, start.Character, end.Line, end.Character, modifier, fromRazor, isCSharpWhitespace: false)
-    {
-    }
-
-    public SemanticRange(int kind, int startLine, int startCharacter, int endLine, int endCharacter, int modifier, bool fromRazor)
-        : this(kind, startLine, startCharacter, endLine, endCharacter, modifier, fromRazor, isCSharpWhitespace: false)
+        : this(kind, start.Line, start.Character, end.Line, end.Character, modifier, fromRazor)
     {
     }
 
@@ -51,8 +45,6 @@ public SemanticRange(int kind, int startLine, int startCharacter, int endLine, i
     /// </summary>
     public bool FromRazor { get; }
 
-    public bool IsCSharpWhitespace { get; }
-
     public LinePositionSpan AsLinePositionSpan()
         => new(new(StartLine, StartCharacter), new(EndLine, EndCharacter));
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs
index 1e7b9a55244..459e91d809d 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs
@@ -60,21 +60,6 @@ protected override IRemoteGoToDefinitionService CreateService(in ServiceArgs arg
 
         var positionInfo = GetPositionInfo(codeDocument, hostDocumentIndex, preferCSharpOverHtml: true);
 
-        // First, see if this is a tag helper. We ignore component attributes here, because they're better served by the C# handler.
-        var componentLocations = await _definitionService.GetDefinitionAsync(
-            context.Snapshot,
-            positionInfo,
-            context.GetSolutionQueryOperations(),
-            ignoreComponentAttributes: true,
-            includeMvcTagHelpers: true,
-            cancellationToken)
-            .ConfigureAwait(false);
-
-        if (componentLocations is { Length: > 0 })
-        {
-            return Results(componentLocations);
-        }
-
         // Check if we're in a string literal with a file path (before calling C# which would navigate to String class)
         if (positionInfo.LanguageKind is RazorLanguageKind.CSharp)
         {
@@ -92,6 +77,21 @@ protected override IRemoteGoToDefinitionService CreateService(in ServiceArgs arg
 
         if (positionInfo.LanguageKind is RazorLanguageKind.Html or RazorLanguageKind.Razor)
         {
+            // First, see if this is a tag helper. We ignore component attributes here, because they're better served by the C# handler.
+            var componentLocations = await _definitionService.GetDefinitionAsync(
+                context.Snapshot,
+                positionInfo,
+                context.GetSolutionQueryOperations(),
+                ignoreComponentAttributes: true,
+                includeMvcTagHelpers: true,
+                cancellationToken)
+                .ConfigureAwait(false);
+
+            if (componentLocations is { Length: > 0 })
+            {
+                return Results(componentLocations);
+            }
+
             // If it isn't a Razor construct, and it isn't C#, let the server know to delegate to HTML.
             return CallHtml;
         }
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/HoverAssertions.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/HoverAssertions.cs
index b4a99a1f3b5..a7156412cb4 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/HoverAssertions.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/HoverAssertions.cs
@@ -74,9 +74,6 @@ public static Action<ClassifiedTextRun> ClassName(string text)
     public static Action<ClassifiedTextRun> Keyword(string text)
         => Run(text, ClassificationTypeNames.Keyword);
 
-    public static Action<ClassifiedTextRun> Namespace(string text)
-        => Run(text, ClassificationTypeNames.NamespaceName);
-
     public static Action<ClassifiedTextRun> LocalName(string text)
         => Run(text, ClassificationTypeNames.LocalName);
 
diff --git a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostFindAllReferencesEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostFindAllReferencesEndpointTest.cs
index 2537ced46f0..2bb3d8b5954 100644
--- a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostFindAllReferencesEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostFindAllReferencesEndpointTest.cs
@@ -86,70 +86,6 @@ await VerifyFindAllReferencesAsync(input,
             (FilePath("OtherClass.cs"), otherClass));
     }
 
-    [Fact]
-    public async Task Component_DefinedInCSharp()
-    {
-        TestCode input = """
-            <[|Surv$$eyPrompt|] Title="InputValue" />
-            """;
-
-        // lang=c#-test
-        TestCode surveyPrompt = """
-            using Microsoft.AspNetCore.Components;
-            using Microsoft.AspNetCore.Components.Rendering;
-
-            namespace SomeProject;
-
-            public class [|SurveyPrompt|] : ComponentBase
-            {
-                [Parameter]
-                public string Title { get; set; } = "Hello";
-
-                protected override void BuildRenderTree(RenderTreeBuilder builder)
-                {
-                    builder.OpenElement(0, "div");
-                    builder.AddContent(1, Title + " from a C#-defined component!");
-                    builder.CloseElement();
-                }
-            }
-            """;
-
-        await VerifyFindAllReferencesAsync(input,
-            (FilePath("SurveyPrompt.cs"), surveyPrompt));
-    }
-
-    [Fact]
-    public async Task ComponentEndTag_DefinedInCSharp()
-    {
-        TestCode input = """
-            <[|SurveyPrompt|] Title="InputValue"></Surv$$eyPrompt>
-            """;
-
-        // lang=c#-test
-        TestCode surveyPrompt = """
-            using Microsoft.AspNetCore.Components;
-            using Microsoft.AspNetCore.Components.Rendering;
-
-            namespace SomeProject;
-
-            public class [|SurveyPrompt|] : ComponentBase
-            {
-                [Parameter]
-                public string Title { get; set; } = "Hello";
-
-                protected override void BuildRenderTree(RenderTreeBuilder builder)
-                {
-                    builder.OpenElement(0, "div");
-                    builder.AddContent(1, Title + " from a C#-defined component!");
-                    builder.CloseElement();
-                }
-            }
-            """;
-
-        await VerifyFindAllReferencesAsync(input,
-            (FilePath("SurveyPrompt.cs"), surveyPrompt));
-    }
-
     private async Task VerifyFindAllReferencesAsync(TestCode input, params (string fileName, TestCode testCode)[] additionalFiles)
     {
         var document = CreateProjectAndRazorDocument(input.Text, additionalFiles: [.. additionalFiles.Select(f => (f.fileName, f.testCode.Text))]);
diff --git a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostGoToDefinitionEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostGoToDefinitionEndpointTest.cs
index cf58f19a46e..59f8d81ab52 100644
--- a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostGoToDefinitionEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostGoToDefinitionEndpointTest.cs
@@ -257,47 +257,6 @@ @namespace SomeProject
         Assert.Equal(range, location.Range);
     }
 
-    [Fact]
-    public async Task Component_DefinedInCSharp()
-    {
-        TestCode input = """
-            <Surv$$eyPrompt Title="InputValue" />
-            """;
-
-        // lang=c#-test
-        TestCode surveyPrompt = """
-            using Microsoft.AspNetCore.Components;
-            using Microsoft.AspNetCore.Components.Rendering;
-
-            namespace SomeProject;
-
-            public class [|SurveyPrompt|] : ComponentBase
-            {
-                [Parameter]
-                public string Title { get; set; } = "Hello";
-
-                protected override void BuildRenderTree(RenderTreeBuilder builder)
-                {
-                    builder.OpenElement(0, "div");
-                    builder.AddContent(1, Title + " from a C#-defined component!");
-                    builder.CloseElement();
-                }
-            }
-            """;
-
-        var result = await GetGoToDefinitionResultAsync(input, RazorFileKind.Component,
-            additionalFiles: (FilePath("SurveyPrompt.cs"), surveyPrompt.Text));
-
-        Assert.NotNull(result.Value.Second);
-        var locations = result.Value.Second;
-        var location = Assert.Single(locations);
-
-        Assert.Equal(FileUri("SurveyPrompt.cs"), location.DocumentUri.GetRequiredParsedUri());
-        var text = SourceText.From(surveyPrompt.Text);
-        var range = text.GetRange(surveyPrompt.Span);
-        Assert.Equal(range, location.Range);
-    }
-
     [Fact]
     public async Task ComponentAttribute_DefinedInCSharp()
     {
diff --git a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostHoverEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostHoverEndpointTest.cs
index 749a158cb26..d81f0f657e0 100644
--- a/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostHoverEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/CohostHoverEndpointTest.cs
@@ -38,18 +38,16 @@ await VerifyHoverAsync(code, async (hover, document) =>
                 Container(
                     Container(
                         Image,
-                        ClassifiedText( // class Microsoft.AspNetCore.Components.Web.PageTitle
-                            Keyword("class"),
-                            WhiteSpace(" "),
-                            Namespace("Microsoft"),
+                        ClassifiedText( // Microsoft.AspNetCore.Components.Web.PageTitle
+                            Text("Microsoft"),
                             Punctuation("."),
-                            Namespace("AspNetCore"),
+                            Text("AspNetCore"),
                             Punctuation("."),
-                            Namespace("Components"),
+                            Text("Components"),
                             Punctuation("."),
-                            Namespace("Web"),
+                            Text("Web"),
                             Punctuation("."),
-                            ClassName("PageTitle")))));
+                            Type("PageTitle")))));
         });
     }
 
@@ -190,22 +188,20 @@ await VerifyHoverAsync(code, async (hover, document) =>
                 Container(
                     Container(
                         Image,
-                        ClassifiedText( // class Microsoft.ApsNetCore.Components.Forms.InputText
-                            Keyword("class"),
-                            WhiteSpace(" "),
-                            Namespace("Microsoft"),
+                        ClassifiedText( // Microsoft.ApsNetCore.Components.Forms.InputText
+                            Text("Microsoft"),
                             Punctuation("."),
-                            Namespace("AspNetCore"),
+                            Text("AspNetCore"),
                             Punctuation("."),
-                            Namespace("Components"),
+                            Text("Components"),
                             Punctuation("."),
-                            Namespace("Forms"),
+                            Text("Forms"),
                             Punctuation("."),
-                            ClassName("InputText")))));
+                            Type("InputText")))));
         });
     }
 
-    [Fact]
+    [Fact(Skip = "Skipped due to revert of https://github.com/dotnet/razor/pull/12287, but don't want to delete the tests because the feature will come back")]
     public async Task ComponentEndTag()
     {
         TestCode code = """
@@ -230,19 +226,19 @@ await VerifyHoverAsync(code, async (hover, document) =>
                         ClassifiedText( // class Microsoft.AspNetCore.Components.Web.PageTitle
                             Keyword("class"),
                             WhiteSpace(" "),
-                            Namespace("Microsoft"),
+                            Text("Microsoft"),
                             Punctuation("."),
-                            Namespace("AspNetCore"),
+                            Text("AspNetCore"),
                             Punctuation("."),
-                            Namespace("Components"),
+                            Text("Components"),
                             Punctuation("."),
-                            Namespace("Web"),
+                            Text("Web"),
                             Punctuation("."),
                             ClassName("PageTitle")))));
         });
     }
 
-    [Fact]
+    [Fact(Skip = "Skipped due to revert of https://github.com/dotnet/razor/pull/12287, but don't want to delete the tests because the feature will come back")]
     public async Task ComponentEndTag_FullyQualified()
     {
         TestCode code = """
@@ -267,19 +263,19 @@ await VerifyHoverAsync(code, async (hover, document) =>
                         ClassifiedText( // class Microsoft.AspNetCore.Components.Web.PageTitle
                             Keyword("class"),
                             WhiteSpace(" "),
-                            Namespace("Microsoft"),
+                            Text("Microsoft"),
                             Punctuation("."),
-                            Namespace("AspNetCore"),
+                            Text("AspNetCore"),
                             Punctuation("."),
-                            Namespace("Components"),
+                            Text("Components"),
                             Punctuation("."),
-                            Namespace("Web"),
+                            Text("Web"),
                             Punctuation("."),
                             ClassName("PageTitle")))));
         });
     }
 
-    [Fact]
+    [Fact(Skip = "Skipped due to revert of https://github.com/dotnet/razor/pull/12287, but don't want to delete the tests because the feature will come back")]
     public async Task ComponentEndTag_FullyQualified_Namespace()
     {
         TestCode code = """
@@ -304,9 +300,9 @@ await VerifyHoverAsync(code, async (hover, document) =>
                         ClassifiedText( // namespace Microsoft.AspNetCore
                             Keyword("namespace"),
                             WhiteSpace(" "),
-                            Namespace("Microsoft"),
+                            Text("Microsoft"),
                             Punctuation("."),
-                            Namespace("AspNetCore")))));
+                            Text("AspNetCore")))));
         });
     }