diff --git a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
index 1cf40d335f..fe8dda3b98 100644
--- a/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
+++ b/src/Avalonia.Controls/Generators/ItemContainerGenerator.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Controls.Generators
         /// calling this method, <see cref="PrepareItemContainer(Control, object, int)"/> should
         /// be called to prepare the container to display the specified item.
         /// </remarks>
-        public Control CreateContainer() => _owner.CreateContainerOverride();
+        public Control CreateContainer() => _owner.CreateContainerForItemOverride();
 
         /// <summary>
         /// Determines whether the specified item is (or is eligible to be) its own container.
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 6bbc608644..b512d3583c 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -265,7 +265,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Creates or a container that can be used to display an item.
         /// </summary>
-        protected internal virtual Control CreateContainerOverride() => new ContentPresenter();
+        protected internal virtual Control CreateContainerForItemOverride() => new ContentPresenter();
 
         /// <summary>
         /// Prepares the specified element to display the specified item.
diff --git a/src/Avalonia.Controls/ListBox.cs b/src/Avalonia.Controls/ListBox.cs
index 78a2d5d990..8b1a307182 100644
--- a/src/Avalonia.Controls/ListBox.cs
+++ b/src/Avalonia.Controls/ListBox.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Controls
         /// </summary>
         public void UnselectAll() => Selection.Clear();
 
-        protected internal override Control CreateContainerOverride() => new ListBoxItem();
+        protected internal override Control CreateContainerForItemOverride() => new ListBoxItem();
 
         /// <inheritdoc/>
         protected override void OnGotFocus(GotFocusEventArgs e)
diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs
index a6085e53cd..33089344e8 100644
--- a/src/Avalonia.Controls/TabControl.cs
+++ b/src/Avalonia.Controls/TabControl.cs
@@ -149,7 +149,7 @@ namespace Avalonia.Controls
             return RegisterContentPresenter(presenter);
         }
 
-        protected internal override Control CreateContainerOverride() => new TabItem();
+        protected internal override Control CreateContainerForItemOverride() => new TabItem();
         protected internal override bool IsItemItsOwnContainerOverride(Control item) => item is TabItem;
 
         protected internal override void PrepareContainerForItemOverride(Control element, object? item, int index)
diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs
index c3e891149a..a1cf3cdb53 100644
--- a/src/Avalonia.Controls/TreeView.cs
+++ b/src/Avalonia.Controls/TreeView.cs
@@ -465,7 +465,7 @@ namespace Avalonia.Controls
             return (false, null);
         }
 
-        protected internal override Control CreateContainerOverride() => new TreeViewItem();
+        protected internal override Control CreateContainerForItemOverride() => new TreeViewItem();
         protected internal override bool IsItemItsOwnContainerOverride(Control item) => item is TreeViewItem;
 
         /// <inheritdoc/>
diff --git a/src/Avalonia.Controls/TreeViewItem.cs b/src/Avalonia.Controls/TreeViewItem.cs
index 3ff34a14b1..6081fef4e6 100644
--- a/src/Avalonia.Controls/TreeViewItem.cs
+++ b/src/Avalonia.Controls/TreeViewItem.cs
@@ -90,7 +90,7 @@ namespace Avalonia.Controls
 
         internal TreeView? TreeViewOwner => _treeView;
 
-        protected internal override Control CreateContainerOverride() => new TreeViewItem();
+        protected internal override Control CreateContainerForItemOverride() => new TreeViewItem();
         protected internal override bool IsItemItsOwnContainerOverride(Control item) => item is TreeViewItem;
 
         /// <inheritdoc/>
diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index b9a6566116..bcf719d2bb 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -1406,7 +1406,7 @@ namespace Avalonia.Controls.UnitTests
 
         private class DerivedTreeViewWithDerivedTreeViewItems : TreeView
         {
-            protected internal override Control CreateContainerOverride() => new DerivedTreeViewItem();
+            protected internal override Control CreateContainerForItemOverride() => new DerivedTreeViewItem();
         }
 
         private class DerivedTreeViewItem : TreeViewItem