diff --git a/src/Umbraco.Core/Components/Composition.cs b/src/Umbraco.Core/Components/Composition.cs
index c81fe388ba..525d8b773e 100644
--- a/src/Umbraco.Core/Components/Composition.cs
+++ b/src/Umbraco.Core/Components/Composition.cs
@@ -98,7 +98,7 @@ namespace Umbraco.Core.Components
         /// </summary>
         /// <typeparam name="TBuilder">The type of the collection builder.</typeparam>
         /// <returns>The collection builder.</returns>
-        public TBuilder GetCollectionBuilder<TBuilder>()
+        public TBuilder WithCollectionBuilder<TBuilder>()
             where TBuilder: ICollectionBuilder, new()
         {
             var typeOfBuilder = typeof(TBuilder);
diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Components/CompositionExtensions.cs
index 8ac8c66bc1..f41ecf7186 100644
--- a/src/Umbraco.Core/Components/CompositionExtensions.cs
+++ b/src/Umbraco.Core/Components/CompositionExtensions.cs
@@ -24,56 +24,56 @@ namespace Umbraco.Core.Components
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static CacheRefresherCollectionBuilder CacheRefreshers(this Composition composition)
-            => composition.GetCollectionBuilder<CacheRefresherCollectionBuilder>();
+            => composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>();
 
         /// <summary>
         /// Gets the mappers collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static MapperCollectionBuilder Mappers(this Composition composition)
-            => composition.GetCollectionBuilder<MapperCollectionBuilder>();
+            => composition.WithCollectionBuilder<MapperCollectionBuilder>();
 
         /// <summary>
         /// Gets the package actions collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         internal static PackageActionCollectionBuilder PackageActions(this Composition composition)
-            => composition.GetCollectionBuilder<PackageActionCollectionBuilder>();
+            => composition.WithCollectionBuilder<PackageActionCollectionBuilder>();
 
         /// <summary>
         /// Gets the data editor collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static DataEditorCollectionBuilder DataEditors(this Composition composition)
-            => composition.GetCollectionBuilder<DataEditorCollectionBuilder>();
+            => composition.WithCollectionBuilder<DataEditorCollectionBuilder>();
 
         /// <summary>
         /// Gets the property value converters collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static PropertyValueConverterCollectionBuilder PropertyValueConverters(this Composition composition)
-            => composition.GetCollectionBuilder<PropertyValueConverterCollectionBuilder>();
+            => composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();
 
         /// <summary>
         /// Gets the url segment providers collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static UrlSegmentProviderCollectionBuilder UrlSegmentProviders(this Composition composition)
-            => composition.GetCollectionBuilder<UrlSegmentProviderCollectionBuilder>();
+            => composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>();
 
         /// <summary>
         /// Gets the validators collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         internal static ManifestValueValidatorCollectionBuilder Validators(this Composition composition)
-            => composition.GetCollectionBuilder<ManifestValueValidatorCollectionBuilder>();
+            => composition.WithCollectionBuilder<ManifestValueValidatorCollectionBuilder>();
 
         /// <summary>
         /// Gets the post-migrations collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         internal static PostMigrationCollectionBuilder PostMigrations(this Composition composition)
-            => composition.GetCollectionBuilder<PostMigrationCollectionBuilder>();
+            => composition.WithCollectionBuilder<PostMigrationCollectionBuilder>();
 
         #endregion
 
diff --git a/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs b/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs
index 63cd4e726b..72d6d37010 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Core.Runtime
             // register persistence mappers - required by database factory so needs to be done here
             // means the only place the collection can be modified is in a runtime - afterwards it
             // has been frozen and it is too late
-            composition.GetCollectionBuilder<MapperCollectionBuilder>().AddCoreMappers();
+            composition.WithCollectionBuilder<MapperCollectionBuilder>().AddCoreMappers();
 
             // register the scope provider
             composition.RegisterSingleton<ScopeProvider>(); // implements both IScopeProvider and IScopeAccessor
@@ -60,7 +60,7 @@ namespace Umbraco.Core.Runtime
             composition.RegisterSingleton<ManifestParser>();
 
             // register our predefined validators
-            composition.GetCollectionBuilder<ManifestValueValidatorCollectionBuilder>()
+            composition.WithCollectionBuilder<ManifestValueValidatorCollectionBuilder>()
                 .Add<RequiredValidator>()
                 .Add<RegexValidator>()
                 .Add<DelimitedValueValidator>()
@@ -69,7 +69,7 @@ namespace Umbraco.Core.Runtime
                 .Add<DecimalValidator>();
 
             // properties and parameters derive from data editors
-            composition.GetCollectionBuilder<DataEditorCollectionBuilder>()
+            composition.WithCollectionBuilder<DataEditorCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetDataEditors());
             composition.RegisterSingleton<PropertyEditorCollection>();
             composition.RegisterSingleton<ParameterEditorCollection>();
@@ -96,13 +96,13 @@ namespace Umbraco.Core.Runtime
                     factory.GetInstance<IGlobalSettings>(),
                     true, new DatabaseServerMessengerOptions()));
 
-            composition.GetCollectionBuilder<CacheRefresherCollectionBuilder>()
+            composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetCacheRefreshers());
 
-            composition.GetCollectionBuilder<PackageActionCollectionBuilder>()
+            composition.WithCollectionBuilder<PackageActionCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetPackageActions());
 
-            composition.GetCollectionBuilder<PropertyValueConverterCollectionBuilder>()
+            composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
                 .Append(composition.TypeLoader.GetTypes<IPropertyValueConverter>());
 
             composition.RegisterSingleton<IPublishedContentTypeFactory, PublishedContentTypeFactory>();
@@ -110,10 +110,10 @@ namespace Umbraco.Core.Runtime
             composition.RegisterSingleton<IShortStringHelper>(factory
                 => new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(factory.GetInstance<IUmbracoSettingsSection>())));
 
-            composition.GetCollectionBuilder<UrlSegmentProviderCollectionBuilder>()
+            composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>()
                 .Append<DefaultUrlSegmentProvider>();
 
-            composition.GetCollectionBuilder<PostMigrationCollectionBuilder>()
+            composition.WithCollectionBuilder<PostMigrationCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetTypes<IPostMigration>());
 
             composition.RegisterSingleton<IMigrationBuilder>(factory => new MigrationBuilder(factory));
diff --git a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs
index 684e06b300..a57ab93f3c 100644
--- a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
             register.Register<IServerRegistrar>(_ => new TestServerRegistrar());
             register.RegisterSingleton<IServerMessenger>(_ => new TestServerMessenger());
 
-            composition.GetCollectionBuilder<CacheRefresherCollectionBuilder>()
+            composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
                 .Add<TestCacheRefresher>();
 
             Current.Factory = register.CreateFactory();
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
index a0ab75f0f9..ef50f0b48a 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Tests.Cache.PublishedCache
         {
             base.Compose();
 
-            Composition.GetCollectionBuilder<UrlSegmentProviderCollectionBuilder>()
+            Composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>()
                 .Clear()
                 .Append<DefaultUrlSegmentProvider>();
         }
diff --git a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
index 0d0374d37a..59230c356c 100644
--- a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
+++ b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void ContainsTypes()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanClearBuilderBeforeCollectionIsCreated()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -66,7 +66,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CannotClearBuilderOnceCollectionIsCreated()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -79,7 +79,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanAppendToBuilder()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>();
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
             builder.Append<Resolved1>();
             builder.Append<Resolved2>();
 
@@ -95,7 +95,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CannotAppendToBuilderOnceCollectionIsCreated()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>();
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
 
             var factory = _composition.CreateFactory();
             var col = builder.CreateCollection(factory);
@@ -108,7 +108,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanAppendDuplicateToBuilderAndDeDuplicate()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>();
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
             builder.Append<Resolved1>();
             builder.Append<Resolved1>();
 
@@ -121,7 +121,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CannotAppendInvalidTypeToBUilder()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>();
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
 
             //builder.Append<Resolved4>(); // does not compile
             Assert.Throws<InvalidOperationException>(() =>
@@ -132,7 +132,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanRemoveFromBuilder()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>()
                 .Remove<Resolved2>();
@@ -149,7 +149,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanRemoveMissingFromBuilder()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>()
                 .Remove<Resolved3>();
@@ -162,7 +162,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CannotRemoveFromBuilderOnceCollectionIsCreated()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -176,7 +176,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanInsertIntoBuilder()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>()
                 .Insert<Resolved3>();
@@ -193,7 +193,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CannotInsertIntoBuilderOnceCollectionIsCreated()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -207,7 +207,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanInsertDuplicateIntoBuilderAndDeDuplicate()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>()
                 .Insert<Resolved2>();
@@ -220,7 +220,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanInsertIntoEmptyBuilder()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>();
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
             builder.Insert<Resolved2>();
 
             var factory = _composition.CreateFactory();
@@ -231,7 +231,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CannotInsertIntoBuilderAtWrongIndex()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -247,7 +247,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanInsertIntoBuilderBefore()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>()
                 .InsertBefore<Resolved2, Resolved3>();
@@ -264,7 +264,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CannotInsertIntoBuilderBeforeOnceCollectionIsCreated()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -278,7 +278,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CanInsertDuplicateIntoBuilderBeforeAndDeDuplicate()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>()
                 .InsertBefore<Resolved1, Resolved2>();
@@ -291,7 +291,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void CannotInsertIntoBuilderBeforeMissing()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>();
 
             Assert.Throws<InvalidOperationException>(() =>
@@ -302,7 +302,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void ScopeBuilderCreatesScopedCollection()
         {
-            _composition.GetCollectionBuilder<TestCollectionBuilder>()
+            _composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -324,7 +324,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void TransientBuilderCreatesTransientCollection()
         {
-            _composition.GetCollectionBuilder<TestCollectionBuilderTransient>()
+            _composition.WithCollectionBuilder<TestCollectionBuilderTransient>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -346,7 +346,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void BuilderRespectsTypesOrder()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilderTransient>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilderTransient>()
                 .Append<Resolved3>()
                 .Insert<Resolved1>()
                 .InsertBefore<Resolved3, Resolved2>();
@@ -359,7 +359,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void ScopeBuilderRespectsContainerScope()
         {
-            _composition.GetCollectionBuilder<TestCollectionBuilderScope>()
+            _composition.WithCollectionBuilder<TestCollectionBuilderScope>()
                 .Append<Resolved1>()
                 .Append<Resolved2>();
 
@@ -395,7 +395,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void WeightedBuilderCreatesWeightedCollection()
         {
-            var builder = _composition.GetCollectionBuilder<TestCollectionBuilderWeighted>()
+            var builder = _composition.WithCollectionBuilder<TestCollectionBuilderWeighted>()
                .Add<Resolved1>()
                .Add<Resolved2>();
 
diff --git a/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs b/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs
index b3009ae90f..656adedf52 100644
--- a/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs
+++ b/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Tests.Composing
             var container = CreateRegister();
             var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), RuntimeLevel.Run);
 
-            composition.GetCollectionBuilder<TestCollectionBuilder>()
+            composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add<TransientObject3>()
                 .Add<TransientObject2>()
                 .Add<TransientObject3>()
@@ -68,7 +68,7 @@ namespace Umbraco.Tests.Composing
             var container = CreateRegister();
             var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), RuntimeLevel.Run);
 
-            composition.GetCollectionBuilder<TestCollectionBuilder>()
+            composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2) })
                 .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2) })
                 .Add(() => new[] { typeof(TransientObject1) });
@@ -93,7 +93,7 @@ namespace Umbraco.Tests.Composing
             var container = CreateRegister();
             var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), RuntimeLevel.Run);
 
-            composition.GetCollectionBuilder<TestCollectionBuilder>()
+            composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add<TransientObject3>()
                 .Add<TransientObject2>()
                 .Add<TransientObject3>()
@@ -119,7 +119,7 @@ namespace Umbraco.Tests.Composing
             var container = CreateRegister();
             var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), RuntimeLevel.Run);
 
-            composition.GetCollectionBuilder<TestCollectionBuilder>()
+            composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add<TransientObject3>()
 
                 // illegal, does not implement the interface!
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.Composing
             var container = CreateRegister();
             var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), RuntimeLevel.Run);
 
-            composition.GetCollectionBuilder<TestCollectionBuilder>()
+            composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add<TransientObject3>()
                 .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2), typeof(TransientObject1) })
                 .Exclude<TransientObject3>();
diff --git a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs
index f66cab18c4..1f08e60375 100644
--- a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs
+++ b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Composing
             
             var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), RuntimeLevel.Run);
 
-            composition.GetCollectionBuilder<PackageActionCollectionBuilder>()
+            composition.WithCollectionBuilder<PackageActionCollectionBuilder>()
                 .Add(() => TypeLoader.GetPackageActions());
 
             Current.Factory = container.CreateFactory();
diff --git a/src/Umbraco.Tests/Integration/ContentEventsTests.cs b/src/Umbraco.Tests/Integration/ContentEventsTests.cs
index df7bdb5ccf..c138e48bfe 100644
--- a/src/Umbraco.Tests/Integration/ContentEventsTests.cs
+++ b/src/Umbraco.Tests/Integration/ContentEventsTests.cs
@@ -52,7 +52,7 @@ namespace Umbraco.Tests.Integration
             Composition.Register<IServerRegistrar>(_ => new TestServerRegistrar()); // localhost-only
             Composition.RegisterSingleton<IServerMessenger, LocalServerMessenger>();
 
-            Composition.GetCollectionBuilder<CacheRefresherCollectionBuilder>()
+            Composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
                 .Add<ContentTypeCacheRefresher>()
                 .Add<ContentCacheRefresher>()
                 .Add<MacroCacheRefresher>();
diff --git a/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs b/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs
index 4d813b5059..c908cca64e 100644
--- a/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Tests.Models.Mapping
             Composition.Register(_ => manifestBuilder);
 
             Func<IEnumerable<Type>> typeListProducerList = Enumerable.Empty<Type>;
-            Composition.GetCollectionBuilder<DataEditorCollectionBuilder>()
+            Composition.WithCollectionBuilder<DataEditorCollectionBuilder>()
                 .Clear()
                 .Add(typeListProducerList);
         }
diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
index 8693f65d4d..1a869183bb 100644
--- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
+++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Tests.PropertyEditors
                 var container = RegisterFactory.Create();
                 var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), RuntimeLevel.Run);
 
-                composition.GetCollectionBuilder<PropertyValueConverterCollectionBuilder>();
+                composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();
 
                 Current.Factory = container.CreateFactory();
 
diff --git a/src/Umbraco.Tests/Published/ConvertersTests.cs b/src/Umbraco.Tests/Published/ConvertersTests.cs
index 026aee4bb1..0937c5ea70 100644
--- a/src/Umbraco.Tests/Published/ConvertersTests.cs
+++ b/src/Umbraco.Tests/Published/ConvertersTests.cs
@@ -178,7 +178,7 @@ namespace Umbraco.Tests.Published
 
             var composition = new Composition(register, new TypeLoader(), Mock.Of<IProfilingLogger>(), RuntimeLevel.Run);
 
-            composition.GetCollectionBuilder<PropertyValueConverterCollectionBuilder>()
+            composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
                 .Append<SimpleConverter3A>()
                 .Append<SimpleConverter3B>();
 
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index 1c66f5a6d3..d18c6b6668 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Tests.PublishedContent
             // fixme - what about the if (PropertyValueConvertersResolver.HasCurrent == false) ??
             // can we risk double - registering and then, what happens?
 
-            Composition.GetCollectionBuilder<PropertyValueConverterCollectionBuilder>()
+            Composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
                 .Clear()
                 .Append<DatePickerValueConverter>()
                 .Append<TinyMceValueConverter>()
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index 9d603a9569..be2f09b0dd 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Tests.PublishedContent
         {
             base.Compose();
 
-            Composition.GetCollectionBuilder<UrlSegmentProviderCollectionBuilder>()
+            Composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>()
                 .Clear()
                 .Append<DefaultUrlSegmentProvider>();
         }
diff --git a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
index 04703e3195..933d8e9f7e 100644
--- a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Tests.Scoping
             _testObjects = new TestObjects(register);
 
             register.RegisterSingleton(factory => new FileSystems(factory, factory.TryGetInstance<ILogger>()));
-            composition.GetCollectionBuilder<MapperCollectionBuilder>();
+            composition.WithCollectionBuilder<MapperCollectionBuilder>();
 
             Current.Factory = register.CreateFactory();
 
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 50d0f42626..1ab6f8d392 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Tests.Scoping
             // so doing all this mess
             Composition.RegisterSingleton<IServerMessenger, ScopedXmlTests.LocalServerMessenger>();
             Composition.RegisterSingleton(f => Mock.Of<IServerRegistrar>());
-            Composition.GetCollectionBuilder<CacheRefresherCollectionBuilder>()
+            Composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
                 .Add(() => Composition.TypeLoader.GetCacheRefreshers());
         }
 
diff --git a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
index b00dfbaa03..815da6e6a6 100644
--- a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Scoping
             // so doing all this mess
             Composition.RegisterSingleton<IServerMessenger, LocalServerMessenger>();
             Composition.RegisterSingleton(f => Mock.Of<IServerRegistrar>());
-            Composition.GetCollectionBuilder<CacheRefresherCollectionBuilder>()
+            Composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
                 .Add(() => Composition.TypeLoader.GetCacheRefreshers());
         }
 
diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
index c829643964..8855bc5a13 100644
--- a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Scoping
             // so doing all this mess
             Composition.RegisterSingleton<IServerMessenger, LocalServerMessenger>();
             Composition.RegisterSingleton(f => Mock.Of<IServerRegistrar>());
-            Composition.GetCollectionBuilder<CacheRefresherCollectionBuilder>()
+            Composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
                 .Add(() => Composition.TypeLoader.GetCacheRefreshers());
         }
 
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 17c31ca409..5cd1cdd1bc 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Tests.Services
             // pfew - see note in ScopedNuCacheTests?
             Composition.RegisterSingleton<IServerMessenger, LocalServerMessenger>();
             Composition.RegisterSingleton(f => Mock.Of<IServerRegistrar>());
-            Composition.GetCollectionBuilder<CacheRefresherCollectionBuilder>()
+            Composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
                 .Add(() => Composition.TypeLoader.GetCacheRefreshers());
         }
 
diff --git a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
index 49b52f4276..8e67aa4e1f 100644
--- a/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
+++ b/src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
@@ -49,7 +49,7 @@ namespace Umbraco.Tests.Services.Importing
             // pollute everything, they are ignored by the type finder and explicitely
             // added to the editors collection
 
-            Composition.GetCollectionBuilder<DataEditorCollectionBuilder>()
+            Composition.WithCollectionBuilder<DataEditorCollectionBuilder>()
                 .Add<Editor1>()
                 .Add<Editor2>();
         }
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
index 846fcfac5d..9dd8324e9f 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
@@ -48,7 +48,7 @@ namespace Umbraco.Tests.TestHelpers
                 false);
             container.RegisterInstance(pluginManager);
 
-            composition.GetCollectionBuilder<MapperCollectionBuilder>()
+            composition.WithCollectionBuilder<MapperCollectionBuilder>()
                 .Add(() => Current.TypeLoader.GetAssignedMapperTypes());
 
             var factory = Current.Factory = container.CreateFactory();
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index cc3ddb6f6a..72468f89b8 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -76,7 +76,7 @@ namespace Umbraco.Tests.TestHelpers
             Composition.Register(factory => PublishedSnapshotService);
             Composition.Register(factory => DefaultCultureAccessor);
 
-            Composition.GetCollectionBuilder<DataEditorCollectionBuilder>()
+            Composition.WithCollectionBuilder<DataEditorCollectionBuilder>()
                 .Clear()
                 .Add(() => Composition.TypeLoader.GetDataEditors());
 
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index e67fd912c8..67fa8361ba 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -211,7 +211,7 @@ namespace Umbraco.Tests.Testing
             // web
             Composition.Register(_ => Umbraco.Web.Composing.Current.UmbracoContextAccessor);
             Composition.RegisterSingleton<PublishedRouter>();
-            Composition.GetCollectionBuilder<ContentFinderCollectionBuilder>();
+            Composition.WithCollectionBuilder<ContentFinderCollectionBuilder>();
             Composition.Register<IContentLastChanceFinder, TestLastChanceFinder>();
             Composition.Register<IVariationContextAccessor, TestVariationContextAccessor>();
         }
@@ -224,14 +224,14 @@ namespace Umbraco.Tests.Testing
             Composition.RegisterSingleton(f => runtimeStateMock.Object);
 
             // ah...
-            Composition.GetCollectionBuilder<ActionCollectionBuilder>();
-            Composition.GetCollectionBuilder<PropertyValueConverterCollectionBuilder>();
+            Composition.WithCollectionBuilder<ActionCollectionBuilder>();
+            Composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();
             Composition.RegisterSingleton<IPublishedContentTypeFactory, PublishedContentTypeFactory>();
 
             Composition.RegisterSingleton<IMediaPathScheme, OriginalMediaPathScheme>();
 
             // register empty content apps collection
-            Composition.GetCollectionBuilder<ContentAppDefinitionCollectionBuilder>();
+            Composition.WithCollectionBuilder<ContentAppDefinitionCollectionBuilder>();
         }
 
         protected virtual void ComposeAutoMapper(bool configure)
@@ -321,7 +321,7 @@ namespace Umbraco.Tests.Testing
             Composition.RegisterSingleton<IPublishedModelFactory, NoopPublishedModelFactory>();
 
             // register application stuff (database factory & context, services...)
-            Composition.GetCollectionBuilder<MapperCollectionBuilder>()
+            Composition.WithCollectionBuilder<MapperCollectionBuilder>()
                 .AddCoreMappers();
 
             Composition.RegisterSingleton<IEventMessagesFactory>(_ => new TransientEventMessagesFactory());
@@ -331,7 +331,7 @@ namespace Umbraco.Tests.Testing
                 new Lazy<IMapperCollection>(Mock.Of<IMapperCollection>)));
             Composition.RegisterSingleton(f => f.TryGetInstance<IUmbracoDatabaseFactory>().SqlContext);
 
-            Composition.GetCollectionBuilder<UrlSegmentProviderCollectionBuilder>(); // empty
+            Composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>(); // empty
 
             Composition.RegisterSingleton(factory
                 => TestObjects.GetScopeProvider(factory.TryGetInstance<ILogger>(), factory.TryGetInstance<FileSystems>(), factory.TryGetInstance<IUmbracoDatabaseFactory>()));
@@ -344,11 +344,11 @@ namespace Umbraco.Tests.Testing
             Composition.RegisterSingleton<ISectionService, SectionService>();
 
             // somehow property editor ends up wanting this
-            Composition.GetCollectionBuilder<ManifestValueValidatorCollectionBuilder>();
+            Composition.WithCollectionBuilder<ManifestValueValidatorCollectionBuilder>();
             Composition.RegisterSingleton<ManifestParser>();
 
             // note - don't register collections, use builders
-            Composition.GetCollectionBuilder<DataEditorCollectionBuilder>();
+            Composition.WithCollectionBuilder<DataEditorCollectionBuilder>();
             Composition.RegisterSingleton<PropertyEditorCollection>();
             Composition.RegisterSingleton<ParameterEditorCollection>();
         }
diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs
index ee57ca98cb..7725fe6524 100644
--- a/src/Umbraco.Web/CompositionExtensions.cs
+++ b/src/Umbraco.Web/CompositionExtensions.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Core.Components
         /// <param name="composition">The composition.</param>
         /// <returns></returns>
         internal static ActionCollectionBuilder Actions(this Composition composition)
-            => composition.GetCollectionBuilder<ActionCollectionBuilder>();
+            => composition.WithCollectionBuilder<ActionCollectionBuilder>();
 
         /// <summary>
         /// Gets the content apps collection builder.
@@ -38,7 +38,7 @@ namespace Umbraco.Core.Components
         /// <param name="composition">The composition.</param>
         /// <returns></returns>
         public static ContentAppDefinitionCollectionBuilder ContentApps(this Composition composition)
-            => composition.GetCollectionBuilder<ContentAppDefinitionCollectionBuilder>();
+            => composition.WithCollectionBuilder<ContentAppDefinitionCollectionBuilder>();
 
         /// <summary>
         /// Gets the content finders collection builder.
@@ -46,7 +46,7 @@ namespace Umbraco.Core.Components
         /// <param name="composition">The composition.</param>
         /// <returns></returns>
         public static ContentFinderCollectionBuilder ContentFinders(this Composition composition)
-            => composition.GetCollectionBuilder<ContentFinderCollectionBuilder>();
+            => composition.WithCollectionBuilder<ContentFinderCollectionBuilder>();
 
         /// <summary>
         /// Gets the editor validators collection builder.
@@ -54,7 +54,7 @@ namespace Umbraco.Core.Components
         /// <param name="composition">The composition.</param>
         /// <returns></returns>
         internal static EditorValidatorCollectionBuilder EditorValidators(this Composition composition)
-            => composition.GetCollectionBuilder<EditorValidatorCollectionBuilder>();
+            => composition.WithCollectionBuilder<EditorValidatorCollectionBuilder>();
 
         /// <summary>
         /// Gets the filtered controller factories collection builder.
@@ -62,21 +62,21 @@ namespace Umbraco.Core.Components
         /// <param name="composition">The composition.</param>
         /// <returns></returns>
         public static FilteredControllerFactoryCollectionBuilder FilderedControllerFactory(this Composition composition)
-            => composition.GetCollectionBuilder<FilteredControllerFactoryCollectionBuilder>();
+            => composition.WithCollectionBuilder<FilteredControllerFactoryCollectionBuilder>();
 
         /// <summary>
         /// Gets the health checks collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         public static HealthCheckCollectionBuilder HealthChecks(this Composition composition)
-            => composition.GetCollectionBuilder<HealthCheckCollectionBuilder>();
+            => composition.WithCollectionBuilder<HealthCheckCollectionBuilder>();
 
         /// <summary>
         /// Gets the url providers collection builder.
         /// </summary>
         /// <param name="composition">The composition.</param>
         internal static UrlProviderCollectionBuilder UrlProviders(this Composition composition)
-            => composition.GetCollectionBuilder<UrlProviderCollectionBuilder>();
+            => composition.WithCollectionBuilder<UrlProviderCollectionBuilder>();
 
         #endregion
 
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
index 29e2cc1058..e5973b24bc 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
@@ -123,20 +123,20 @@ namespace Umbraco.Web.Runtime
                 .ComposeMvcControllers(GetType().Assembly)
                 .ComposeApiControllers(GetType().Assembly);
 
-            composition.GetCollectionBuilder<SearchableTreeCollectionBuilder>()
+            composition.WithCollectionBuilder<SearchableTreeCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetTypes<ISearchableTree>()); // fixme which searchable trees?!
 
-            composition.GetCollectionBuilder<EditorValidatorCollectionBuilder>()
+            composition.WithCollectionBuilder<EditorValidatorCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetTypes<IEditorValidator>());
 
-            composition.GetCollectionBuilder<TourFilterCollectionBuilder>();
+            composition.WithCollectionBuilder<TourFilterCollectionBuilder>();
 
             composition.RegisterSingleton<UmbracoFeatures>();
 
             // set the default RenderMvcController
             Current.DefaultRenderMvcControllerType = typeof(RenderMvcController); // fixme WRONG!
 
-            composition.GetCollectionBuilder<ActionCollectionBuilder>()
+            composition.WithCollectionBuilder<ActionCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetTypes<IAction>());
 
             var surfaceControllerTypes = new SurfaceControllerTypeCollection(composition.TypeLoader.GetSurfaceControllers());
@@ -150,24 +150,24 @@ namespace Umbraco.Web.Runtime
             // here because there cannot be two converters for one property editor - and we want the full
             // RteMacroRenderingValueConverter that converts macros, etc. So remove TinyMceValueConverter.
             // (the limited one, defined in Core, is there for tests) - same for others
-            composition.GetCollectionBuilder<PropertyValueConverterCollectionBuilder>()
+            composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
                 .Remove<TinyMceValueConverter>()
                 .Remove<TextStringValueConverter>()
                 .Remove<MarkdownEditorValueConverter>();
 
             // add all known factories, devs can then modify this list on application
             // startup either by binding to events or in their own global.asax
-            composition.GetCollectionBuilder<FilteredControllerFactoryCollectionBuilder>()
+            composition.WithCollectionBuilder<FilteredControllerFactoryCollectionBuilder>()
                 .Append<RenderControllerFactory>();
 
-            composition.GetCollectionBuilder<UrlProviderCollectionBuilder>()
+            composition.WithCollectionBuilder<UrlProviderCollectionBuilder>()
                 .Append<AliasUrlProvider>()
                 .Append<DefaultUrlProvider>()
                 .Append<CustomRouteUrlProvider>();
 
             composition.RegisterSingleton<IContentLastChanceFinder, ContentFinderByLegacy404>();
 
-            composition.GetCollectionBuilder<ContentFinderCollectionBuilder>()
+            composition.WithCollectionBuilder<ContentFinderCollectionBuilder>()
                 // all built-in finders in the correct order,
                 // devs can then modify this list on application startup
                 .Append<ContentFinderByPageIdQuery>()
@@ -182,10 +182,10 @@ namespace Umbraco.Web.Runtime
             composition.RegisterSingleton<ICultureDictionaryFactory, DefaultCultureDictionaryFactory>();
 
             // register *all* checks, except those marked [HideFromTypeFinder] of course
-            composition.GetCollectionBuilder<HealthCheckCollectionBuilder>()
+            composition.WithCollectionBuilder<HealthCheckCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetTypes<HealthCheck.HealthCheck>());
 
-            composition.GetCollectionBuilder<HealthCheckNotificationMethodCollectionBuilder>()
+            composition.WithCollectionBuilder<HealthCheckNotificationMethodCollectionBuilder>()
                 .Add(() => composition.TypeLoader.GetTypes<HealthCheck.NotificationMethods.IHealthCheckNotificationMethod>());
 
             // auto-register views
@@ -202,7 +202,7 @@ namespace Umbraco.Web.Runtime
             composition.RegisterSingleton<IPublishedValueFallback, PublishedValueFallback>();
 
             // register known content apps
-            composition.GetCollectionBuilder<ContentAppDefinitionCollectionBuilder>()
+            composition.WithCollectionBuilder<ContentAppDefinitionCollectionBuilder>()
                 .Append<ListViewContentAppDefinition>()
                 .Append<ContentEditorContentAppDefinition>()
                 .Append<ContentInfoContentAppDefinition>();