diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-default.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-default.context.ts
index 4b25289ff1..c64e88340f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-default.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-default.context.ts
@@ -18,7 +18,7 @@ import type { UmbCollectionFilterModel } from '@umbraco-cms/backoffice/collectio
 import { UmbSelectionManager, UmbPaginationManager } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 
-export class UmbCollectionDefaultContext<ItemType, FilterModelType extends UmbCollectionFilterModel>
+export class UmbDefaultCollectionContext<ItemType = any, FilterModelType extends UmbCollectionFilterModel = any>
 	extends UmbBaseController
 	implements UmbCollectionContext, UmbApi
 {
@@ -192,6 +192,6 @@ export class UmbCollectionDefaultContext<ItemType, FilterModelType extends UmbCo
 	}
 }
 
-export const UMB_COLLECTION_CONTEXT = new UmbContextToken<UmbCollectionDefaultContext<any, any>>(
+export const UMB_COLLECTION_CONTEXT = new UmbContextToken<UmbDefaultCollectionContext<any, any>>(
 	'UmbCollectionContext',
 );
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-default.element.ts
index 9187359b6c..b7fc10786b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-default.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-default.element.ts
@@ -1,4 +1,4 @@
-import { UMB_COLLECTION_CONTEXT, UmbCollectionDefaultContext } from './collection-default.context.js';
+import { UMB_COLLECTION_CONTEXT, UmbDefaultCollectionContext } from './collection-default.context.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
@@ -19,7 +19,7 @@ const manifest: UmbBackofficeManifestKind = {
 		type: 'collection',
 		kind: 'default',
 		elementName: 'umb-collection-default',
-		api: UmbCollectionDefaultContext,
+		api: UmbDefaultCollectionContext,
 	},
 };
 umbExtensionsRegistry.register(manifest);
@@ -29,7 +29,7 @@ export class UmbCollectionDefaultElement extends UmbLitElement {
 	@state()
 	private _routes: Array<UmbRoute> = [];
 
-	#collectionContext?: UmbCollectionDefaultContext<any, any>;
+	#collectionContext?: UmbDefaultCollectionContext<any, any>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-action-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-action-bundle.element.ts
index b0bc57ac65..f35d5f27cf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-action-bundle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-action-bundle.element.ts
@@ -1,11 +1,11 @@
-import { UMB_COLLECTION_CONTEXT, UmbCollectionDefaultContext } from '../collection-default.context.js';
+import { UMB_COLLECTION_CONTEXT, UmbDefaultCollectionContext } from '../collection-default.context.js';
 import { html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-collection-action-bundle')
 export class UmbCollectionActionBundleElement extends UmbLitElement {
-	#collectionContext?: UmbCollectionDefaultContext<any, any>;
+	#collectionContext?: UmbDefaultCollectionContext<any, any>;
 
 	@state()
 	_collectionAlias? = '';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts
index f0ae8d062a..2b02c7eddf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts
@@ -1,7 +1,7 @@
 import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
-import { UMB_COLLECTION_CONTEXT, UmbCollectionDefaultContext } from '@umbraco-cms/backoffice/collection';
+import { UMB_COLLECTION_CONTEXT, UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-collection-selection-actions')
@@ -17,7 +17,7 @@ export class UmbCollectionSelectionActionsElement extends UmbLitElement {
 
 	private _selection: Array<string | null> = [];
 
-	private _collectionContext?: UmbCollectionDefaultContext<any, any>;
+	private _collectionContext?: UmbDefaultCollectionContext<any, any>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts
index 36be7956d9..b6613609e2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts
@@ -1,4 +1,4 @@
-import { UMB_COLLECTION_CONTEXT, UmbCollectionDefaultContext } from '../collection-default.context.js';
+import { UMB_COLLECTION_CONTEXT, UmbDefaultCollectionContext } from '../collection-default.context.js';
 import { ManifestCollectionView } from '../../extension-registry/models/collection-view.model.js';
 import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
@@ -15,7 +15,7 @@ export class UmbCollectionViewBundleElement extends UmbLitElement {
 	@state()
 	private _collectionRootPathname = '';
 
-	#collectionContext?: UmbCollectionDefaultContext<any, any>;
+	#collectionContext?: UmbDefaultCollectionContext<any, any>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/pagination/collection-pagination.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/pagination/collection-pagination.element.ts
index e879e39a88..683e6ff980 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/pagination/collection-pagination.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/pagination/collection-pagination.element.ts
@@ -1,7 +1,7 @@
 import { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, nothing, state } from '@umbraco-cms/backoffice/external/lit';
-import { UMB_COLLECTION_CONTEXT, UmbCollectionDefaultContext } from '@umbraco-cms/backoffice/collection';
+import { UMB_COLLECTION_CONTEXT, UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-collection-pagination')
@@ -12,7 +12,7 @@ export class UmbCollectionPaginationElement extends UmbLitElement {
 	@state()
 	_currentPage = 1;
 
-	private _collectionContext?: UmbCollectionDefaultContext<any, any>;
+	private _collectionContext?: UmbDefaultCollectionContext<any, any>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-content/views/collection/workspace-view-collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
index 3d59af8e56..fbac8b216e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-content/views/collection/workspace-view-collection.element.ts
@@ -1,6 +1,6 @@
 import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { UmbCollectionDefaultContext } from '@umbraco-cms/backoffice/collection';
+import { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import type { FolderTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import type { ManifestWorkspaceViewCollection } from '@umbraco-cms/backoffice/extension-registry';
@@ -15,7 +15,7 @@ export class UmbWorkspaceViewCollectionElement extends UmbLitElement {
 	private _workspaceContext?: typeof UMB_WORKSPACE_CONTEXT.TYPE;
 
 	// TODO: add type for the collection context.
-	private _collectionContext?: UmbCollectionDefaultContext<FolderTreeItemResponseModel, any>;
+	private _collectionContext?: UmbDefaultCollectionContext<FolderTreeItemResponseModel, any>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts
index e4766a0c18..fb4cc53123 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts
@@ -10,7 +10,7 @@ import {
 	UmbTableOrderedEvent,
 	UmbTableSelectedEvent,
 } from '@umbraco-cms/backoffice/components';
-import { UMB_COLLECTION_CONTEXT, UmbCollectionDefaultContext } from '@umbraco-cms/backoffice/collection';
+import { UMB_COLLECTION_CONTEXT, UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { DocumentTreeItemResponseModel, EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
@@ -50,7 +50,7 @@ export class UmbDocumentTableCollectionViewElement extends UmbLitElement {
 	@state()
 	private _selection: Array<string | null> = [];
 
-	private _collectionContext?: UmbCollectionDefaultContext<EntityType, any>;
+	private _collectionContext?: UmbDefaultCollectionContext<EntityType, any>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-grid-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-grid-collection-view.element.ts
index 9c81fff700..6e6c4f995b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-grid-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-grid-collection-view.element.ts
@@ -1,6 +1,6 @@
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit';
-import { UmbCollectionDefaultContext, UMB_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection';
+import { UmbDefaultCollectionContext, UMB_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
@@ -12,7 +12,7 @@ export class UmbMediaGridCollectionViewElement extends UmbLitElement {
 	@state()
 	private _selection: Array<string | null> = [];
 
-	private _collectionContext?: UmbCollectionDefaultContext<EntityTreeItemResponseModel, any>;
+	private _collectionContext?: UmbDefaultCollectionContext<EntityTreeItemResponseModel, any>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-table-collection-view.element.ts
index 8d406f9a95..133baf6ca5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-table-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-table-collection-view.element.ts
@@ -10,7 +10,7 @@ import type {
 	UmbTableOrderedEvent,
 	UmbTableSelectedEvent,
 } from '@umbraco-cms/backoffice/components';
-import { UmbCollectionDefaultContext, UMB_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection';
+import { UmbDefaultCollectionContext, UMB_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
@@ -38,7 +38,7 @@ export class UmbMediaTableCollectionViewElement extends UmbLitElement {
 	@state()
 	private _selection: Array<string | null> = [];
 
-	private _collectionContext?: UmbCollectionDefaultContext<UmbMediaDetailModel, any>;
+	private _collectionContext?: UmbDefaultCollectionContext<UmbMediaDetailModel, any>;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts
index 04d36a3c16..b917be609c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts
@@ -1,7 +1,7 @@
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
-import { UMB_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection';
+import { UMB_COLLECTION_CONTEXT, UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
 import { UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
 import '../components/user-group-table-name-column-layout.element.js';
@@ -54,7 +54,7 @@ export class UmbUserGroupCollectionTableViewElement extends UmbLitElement {
 	@state()
 	private _userGroups: Array<UserGroupResponseModel> = [];
 
-	#collectionContext?: UmbUserGroupCollectionContext;
+	#collectionContext?: UmbDefaultCollectionContext;
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts
index 976d44345e..58623f484d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts
@@ -1,9 +1,9 @@
 import { UmbUserCollectionFilterModel, UmbUserDetail } from '../types.js';
-import { UmbCollectionDefaultContext } from '@umbraco-cms/backoffice/collection';
+import { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
 import { UserOrderModel, UserStateModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbUserCollectionContext extends UmbCollectionDefaultContext<UmbUserDetail, UmbUserCollectionFilterModel> {
+export class UmbUserCollectionContext extends UmbDefaultCollectionContext<UmbUserDetail, UmbUserCollectionFilterModel> {
 	constructor(host: UmbControllerHostElement) {
 		super(host, { pageSize: 50 });
 	}