diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs
index cc62d7e05f..6db55d6e3b 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs
@@ -228,7 +228,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation.Engine
                                 if (TryGetComponentTypeNameFromTagName(tagNameOriginalCase, out var componentTypeName))
                                 {
                                     codeWriter
-                                        .WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.OpenComponentElement)}<{componentTypeName}>")
+                                        .WriteStartMethodInvocation($"{builderVarName}.{nameof(RenderTreeBuilder.OpenComponent)}<{componentTypeName}>")
                                         .Write((_sourceSequence++).ToString())
                                         .WriteEndMethodInvocation();
                                     isComponent = true;
diff --git a/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeBuilder.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeBuilder.cs
index e2200d23ad..2b428de6a7 100644
--- a/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeBuilder.cs
+++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeBuilder.cs
@@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Blazor.RenderTree
 
         /// <summary>
         /// Marks a previously appended component frame as closed. Calls to this method
-        /// must be balanced with calls to <see cref="OpenComponentElement{TComponent}"/>.
+        /// must be balanced with calls to <see cref="OpenComponent{TComponent}"/>.
         /// </summary>
         public void CloseComponent()
         {
@@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Blazor.RenderTree
         /// </summary>
         /// <typeparam name="TComponent">The type of the child component.</typeparam>
         /// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
-        public void OpenComponentElement<TComponent>(int sequence) where TComponent : IComponent
+        public void OpenComponent<TComponent>(int sequence) where TComponent : IComponent
         {
             // Currently, child components can't have further grandchildren of their own, so it would
             // technically be possible to skip their CloseElement calls and not track them in _openElementIndices.
diff --git a/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeBuilderTest.cs b/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeBuilderTest.cs
index 38fb9192fa..8cf97b9389 100644
--- a/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeBuilderTest.cs
+++ b/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeBuilderTest.cs
@@ -253,11 +253,11 @@ namespace Microsoft.AspNetCore.Blazor.Test
 
             // Act
             builder.OpenElement(10, "parent");                   //  0: <parent>
-            builder.OpenComponentElement<TestComponent>(11);     //  1:     <testcomponent
+            builder.OpenComponent<TestComponent>(11);            //  1:     <testcomponent
             builder.AddAttribute(12, "child1attribute1", "A");   //  2:       child1attribute1="A"
             builder.AddAttribute(13, "child1attribute2", "B");   //  3:       child1attribute2="B">
             builder.CloseComponent();                            //         </testcomponent>
-            builder.OpenComponentElement<TestComponent>(14);     //  4:     <testcomponent
+            builder.OpenComponent<TestComponent>(14);            //  4:     <testcomponent
             builder.AddAttribute(15, "child2attribute", "C");    //  5:       child2attribute="C">
             builder.CloseComponent();                            //         </testcomponent>
             builder.CloseElement();                              //     </parent>
diff --git a/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeDiffComputerTest.cs b/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeDiffComputerTest.cs
index dc4b6c3152..033f6c4513 100644
--- a/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeDiffComputerTest.cs
+++ b/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeDiffComputerTest.cs
@@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
                     builder.AddAttribute(1, "My attribute", "My value");
                     builder.CloseElement();
                 },
-                builder => builder.OpenComponentElement<FakeComponent>(0)
+                builder => builder.OpenComponent<FakeComponent>(0)
             }.Select(x => new object[] { x });
 
         [Fact]
@@ -312,8 +312,8 @@ namespace Microsoft.AspNetCore.Blazor.Test
         public void RecognizesComponentTypeChangesAtSameSequenceNumber()
         {
             // Arrange
-            oldTree.OpenComponentElement<FakeComponent>(123);
-            newTree.OpenComponentElement<FakeComponent2>(123);
+            oldTree.OpenComponent<FakeComponent>(123);
+            newTree.OpenComponent<FakeComponent2>(123);
 
             // Act
             var renderBatch = GetRenderedBatch();
@@ -585,9 +585,9 @@ namespace Microsoft.AspNetCore.Blazor.Test
             oldTree.CloseElement();                             //     </container>
             newTree.AddText(10, "text1");                       //  0: text1
             newTree.OpenElement(11, "container");               //  1: <container>
-            newTree.OpenComponentElement<FakeComponent>(12);    //  2:   <FakeComponent>
+            newTree.OpenComponent<FakeComponent>(12);           //  2:   <FakeComponent>
             newTree.CloseComponent();                           //       </FakeComponent>
-            newTree.OpenComponentElement<FakeComponent2>(13);   //  3:   <FakeComponent2>
+            newTree.OpenComponent<FakeComponent2>(13);          //  3:   <FakeComponent2>
             newTree.CloseComponent();                           //       </FakeComponent2>
             newTree.CloseElement();                             //     </container>
 
@@ -641,7 +641,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
         {
             // Arrange
             var testObject = new object();
-            newTree.OpenComponentElement<FakeComponent>(0);
+            newTree.OpenComponent<FakeComponent>(0);
             newTree.AddAttribute(1, nameof(FakeComponent.IntProperty), 123);
             newTree.AddAttribute(2, nameof(FakeComponent.StringProperty), "some string");
             newTree.AddAttribute(3, nameof(FakeComponent.ObjectProperty), testObject);
@@ -667,7 +667,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
         {
             // Arrange
             var testObject = new object();
-            newTree.OpenComponentElement<FakeComponent>(0);
+            newTree.OpenComponent<FakeComponent>(0);
             newTree.AddAttribute(1, "SomeUnknownProperty", 123);
             newTree.CloseComponent();
 
@@ -684,7 +684,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
         {
             // Arrange
             var testObject = new object();
-            newTree.OpenComponentElement<FakeComponent>(0);
+            newTree.OpenComponent<FakeComponent>(0);
             newTree.AddAttribute(1, nameof(FakeComponent.ReadonlyProperty), 123);
             newTree.CloseComponent();
 
@@ -703,16 +703,16 @@ namespace Microsoft.AspNetCore.Blazor.Test
             // Arrange
             oldTree.AddText(10, "text1");                       //  0: text1
             oldTree.OpenElement(11, "container");               //  1: <container>
-            oldTree.OpenComponentElement<FakeComponent>(12);    //  2:   <FakeComponent>
+            oldTree.OpenComponent<FakeComponent>(12);           //  2:   <FakeComponent>
             oldTree.CloseComponent();                           //       </FakeComponent>
-            oldTree.OpenComponentElement<FakeComponent2>(13);   //  3:   <FakeComponent2>
+            oldTree.OpenComponent<FakeComponent2>(13);          //  3:   <FakeComponent2>
             oldTree.CloseComponent();                           //       </FakeComponent2>
             oldTree.CloseElement();                             //     </container>
             newTree.AddText(10, "text1");                       //  0: text1
             newTree.OpenElement(11, "container");               //  1: <container>
-            newTree.OpenComponentElement<FakeComponent>(12);    //  2:   <FakeComponent>
+            newTree.OpenComponent<FakeComponent>(12);           //  2:   <FakeComponent>
             newTree.CloseComponent();                           //       </FakeComponent>
-            newTree.OpenComponentElement<FakeComponent2>(13);   //  3:   <FakeComponent2>
+            newTree.OpenComponent<FakeComponent2>(13);          //  3:   <FakeComponent2>
             newTree.CloseComponent();                           //       </FakeComponent2>
             newTree.CloseElement();                             //     </container
 
@@ -738,11 +738,11 @@ namespace Microsoft.AspNetCore.Blazor.Test
         {
             // Arrange
             var objectWillNotChange = new object();
-            oldTree.OpenComponentElement<FakeComponent>(12);
+            oldTree.OpenComponent<FakeComponent>(12);
             oldTree.AddAttribute(13, nameof(FakeComponent.StringProperty), "String will change");
             oldTree.AddAttribute(14, nameof(FakeComponent.ObjectProperty), objectWillNotChange);
             oldTree.CloseComponent();
-            newTree.OpenComponentElement<FakeComponent>(12);
+            newTree.OpenComponent<FakeComponent>(12);
             newTree.AddAttribute(13, nameof(FakeComponent.StringProperty), "String did change");
             newTree.AddAttribute(14, nameof(FakeComponent.ObjectProperty), objectWillNotChange);
             newTree.CloseComponent();
@@ -766,7 +766,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
         public void NotifiesIHandlePropertiesChangedBeforeFirstRender()
         {
             // Arrange
-            newTree.OpenComponentElement<HandlePropertiesChangedComponent>(0);
+            newTree.OpenComponent<HandlePropertiesChangedComponent>(0);
             newTree.CloseComponent();
 
             // Act
@@ -784,13 +784,13 @@ namespace Microsoft.AspNetCore.Blazor.Test
             // Arrange
             var newTree1 = new RenderTreeBuilder(renderer);
             var newTree2 = new RenderTreeBuilder(renderer);
-            oldTree.OpenComponentElement<HandlePropertiesChangedComponent>(0);
+            oldTree.OpenComponent<HandlePropertiesChangedComponent>(0);
             oldTree.AddAttribute(1, nameof(HandlePropertiesChangedComponent.IntProperty), 123);
             oldTree.CloseComponent();
-            newTree1.OpenComponentElement<HandlePropertiesChangedComponent>(0);
+            newTree1.OpenComponent<HandlePropertiesChangedComponent>(0);
             newTree1.AddAttribute(1, nameof(HandlePropertiesChangedComponent.IntProperty), 123);
             newTree1.CloseComponent();
-            newTree2.OpenComponentElement<HandlePropertiesChangedComponent>(0);
+            newTree2.OpenComponent<HandlePropertiesChangedComponent>(0);
             newTree2.AddAttribute(1, nameof(HandlePropertiesChangedComponent.IntProperty), 456);
             newTree2.CloseComponent();
 
@@ -819,14 +819,14 @@ namespace Microsoft.AspNetCore.Blazor.Test
         public void CallsDisposeOnlyOnRemovedChildComponents()
         {
             // Arrange
-            oldTree.OpenComponentElement<DisposableComponent>(10);       // <DisposableComponent>
-            oldTree.CloseComponent();                                    // </DisposableComponent>
-            oldTree.OpenComponentElement<NonDisposableComponent>(20);    // <NonDisposableComponent>
-            oldTree.CloseComponent();                                    // </NonDisposableComponent>
-            oldTree.OpenComponentElement<DisposableComponent>(30);       // <DisposableComponent>
-            oldTree.CloseComponent();                                    // </DisposableComponent>
-            newTree.OpenComponentElement<DisposableComponent>(30);       // <DisposableComponent>
-            newTree.CloseComponent();                                    // </DisposableComponent>
+            oldTree.OpenComponent<DisposableComponent>(10);       // <DisposableComponent>
+            oldTree.CloseComponent();                             // </DisposableComponent>
+            oldTree.OpenComponent<NonDisposableComponent>(20);    // <NonDisposableComponent>
+            oldTree.CloseComponent();                             // </NonDisposableComponent>
+            oldTree.OpenComponent<DisposableComponent>(30);       // <DisposableComponent>
+            oldTree.CloseComponent();                             // </DisposableComponent>
+            newTree.OpenComponent<DisposableComponent>(30);       // <DisposableComponent>
+            newTree.CloseComponent();                             // </DisposableComponent>
 
             diff.ApplyNewRenderTreeVersion(new RenderBatchBuilder(), 0, new RenderTreeBuilder(renderer).GetFrames(), oldTree.GetFrames());
             var disposableComponent1 = (DisposableComponent)oldTree.GetFrames().Array[0].Component;
diff --git a/test/Microsoft.AspNetCore.Blazor.Test/RendererTest.cs b/test/Microsoft.AspNetCore.Blazor.Test/RendererTest.cs
index 4f97cf9306..7b27b7b289 100644
--- a/test/Microsoft.AspNetCore.Blazor.Test/RendererTest.cs
+++ b/test/Microsoft.AspNetCore.Blazor.Test/RendererTest.cs
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
             var component = new TestComponent(builder =>
             {
                 builder.AddText(0, "Hello");
-                builder.OpenComponentElement<MessageComponent>(1);
+                builder.OpenComponent<MessageComponent>(1);
                 builder.AddAttribute(2, nameof(MessageComponent.Message), "Nested component output");
                 builder.CloseComponent();
             });
@@ -91,7 +91,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
             var renderer = new TestRenderer();
             var parentComponent = new TestComponent(builder =>
             {
-                builder.OpenComponentElement<MessageComponent>(0);
+                builder.OpenComponent<MessageComponent>(0);
                 builder.CloseComponent();
             });
             var parentComponentId = renderer.AssignComponentId(parentComponent);
@@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
             var renderer = new TestRenderer();
             var parentComponent = new TestComponent(builder =>
             {
-                builder.OpenComponentElement<EventComponent>(0);
+                builder.OpenComponent<EventComponent>(0);
                 builder.CloseComponent();
             });
             var parentComponentId = renderer.AssignComponentId(parentComponent);
@@ -306,7 +306,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
             var component = new TestComponent(builder =>
             {
                 builder.AddText(0, message);
-                builder.OpenComponentElement<MessageComponent>(1);
+                builder.OpenComponent<MessageComponent>(1);
                 builder.CloseComponent();
             });
 
@@ -336,7 +336,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
             var firstRender = true;
             var component = new TestComponent(builder =>
             {
-                builder.OpenComponentElement<FakeComponent>(1);
+                builder.OpenComponent<FakeComponent>(1);
                 builder.AddAttribute(2, nameof(FakeComponent.IntProperty), firstRender ? 123 : 256);
                 builder.AddAttribute(3, nameof(FakeComponent.ObjectProperty), objectThatWillNotChange);
                 builder.AddAttribute(4, nameof(FakeComponent.StringProperty), firstRender ? "String that will change" : "String that did change");
@@ -378,7 +378,7 @@ namespace Microsoft.AspNetCore.Blazor.Test
             var firstRender = true;
             var component = new TestComponent(builder =>
             {
-                builder.OpenComponentElement<MessageComponent>(1);
+                builder.OpenComponent<MessageComponent>(1);
                 builder.AddAttribute(2, nameof(MessageComponent.Message), firstRender ? "first" : "second");
                 builder.CloseComponent();
             });
@@ -413,12 +413,12 @@ namespace Microsoft.AspNetCore.Blazor.Test
                 builder.OpenElement(7, "some element");
                 if (firstRender)
                 {
-                    builder.OpenComponentElement<FakeComponent>(100);
+                    builder.OpenComponent<FakeComponent>(100);
                     builder.CloseComponent();
-                    builder.OpenComponentElement<FakeComponent>(150);
+                    builder.OpenComponent<FakeComponent>(150);
                     builder.CloseComponent();
                 }
-                builder.OpenComponentElement<FakeComponent>(200);
+                builder.OpenComponent<FakeComponent>(200);
                 builder.CloseComponent();
                 builder.CloseElement();
             });