diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.context.ts
index 09a30dd082..46e1c7a2e8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.context.ts
@@ -4,8 +4,11 @@ import { UMB_SECTION_PICKER_MODAL } from '../../section-picker-modal/section-pic
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbSectionPickerContext extends UmbPickerInputContext<UmbSectionItemModel> {
+export class UmbSectionPickerInputContext extends UmbPickerInputContext<UmbSectionItemModel> {
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_SECTION_ITEM_REPOSITORY_ALIAS, UMB_SECTION_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbSectionPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbSectionPickerInputContext as UmbSectionPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.element.ts
index e2db5cafb1..7745899108 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/components/input-section/input-section.element.ts
@@ -1,5 +1,5 @@
 import type { UmbSectionItemModel } from '../../repository/index.js';
-import { UmbSectionPickerContext } from './input-section.context.js';
+import { UmbSectionPickerInputContext } from './input-section.context.js';
 import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
@@ -73,7 +73,7 @@ export class UmbInputSectionElement extends UmbFormControlMixin<string | undefin
 	@state()
 	private _items?: Array<UmbSectionItemModel>;
 
-	#pickerContext = new UmbSectionPickerContext(this);
+	#pickerContext = new UmbSectionPickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.context.ts
index 552dccad76..349a97f0ad 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.context.ts
@@ -6,7 +6,7 @@ import type { UmbDataTypeTreeItemModel } from '../../tree/types.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 
-export class UmbDataTypePickerContext extends UmbPickerInputContext<
+export class UmbDataTypePickerInputContext extends UmbPickerInputContext<
 	UmbDataTypeItemModel,
 	UmbDataTypeTreeItemModel,
 	UmbDataTypePickerModalData,
@@ -16,3 +16,6 @@ export class UmbDataTypePickerContext extends UmbPickerInputContext<
 		super(host, UMB_DATA_TYPE_ITEM_REPOSITORY_ALIAS, UMB_DATA_TYPE_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbDataTypePickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbDataTypePickerInputContext as UmbDataTypePickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.element.ts
index b83c05e011..5d09941fc7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/components/data-type-input/data-type-input.element.ts
@@ -1,5 +1,5 @@
 import type { UmbDataTypeItemModel } from '../../repository/item/types.js';
-import { UmbDataTypePickerContext } from './data-type-input.context.js';
+import { UmbDataTypePickerInputContext } from './data-type-input.context.js';
 import { css, html, customElement, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
@@ -92,7 +92,7 @@ export class UmbDataTypeInputElement extends UUIFormControlMixin(UmbLitElement,
 	@state()
 	private _items?: Array<UmbDataTypeItemModel>;
 
-	#pickerContext = new UmbDataTypePickerContext(this);
+	#pickerContext = new UmbDataTypePickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/components/input-dictionary/input-dictionary.context.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/components/input-dictionary/input-dictionary.context.ts
index 834f11fc16..0dfd2bf9d1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/components/input-dictionary/input-dictionary.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/components/input-dictionary/input-dictionary.context.ts
@@ -9,7 +9,7 @@ import type {
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 
-export class UmbDictionaryPickerContext extends UmbPickerInputContext<
+export class UmbDictionaryPickerInputContext extends UmbPickerInputContext<
 	UmbDictionaryItemModel,
 	UmbDictionaryTreeItemModel,
 	UmbDictionaryPickerModalData,
@@ -19,3 +19,6 @@ export class UmbDictionaryPickerContext extends UmbPickerInputContext<
 		super(host, UMB_DICTIONARY_ITEM_REPOSITORY_ALIAS, UMB_DICTIONARY_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbDictionaryPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbDictionaryPickerInputContext as UmbDictionaryPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/index.ts
index b3b43602fe..6d04ed0384 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/index.ts
@@ -1,2 +1 @@
-export { UmbDocumentTypePickerContext } from './input-document-type/input-document-type.context.js';
-export { UmbInputDocumentTypeElement } from './input-document-type/input-document-type.element.js';
+export * from './input-document-type/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/index.ts
new file mode 100644
index 0000000000..9fe3e336c6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/index.ts
@@ -0,0 +1,2 @@
+export * from './input-document-type.context.js';
+export * from './input-document-type.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.context.ts
index 059557f931..4135edd8ed 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.context.ts
@@ -6,7 +6,7 @@ import { UMB_DOCUMENT_TYPE_ITEM_REPOSITORY_ALIAS } from '../../repository/index.
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbDocumentTypePickerContext extends UmbPickerInputContext<
+export class UmbDocumentTypePickerInputContext extends UmbPickerInputContext<
 	UmbDocumentTypeItemModel,
 	UmbDocumentTypeTreeItemModel,
 	UmbDocumentTypePickerModalData,
@@ -16,3 +16,6 @@ export class UmbDocumentTypePickerContext extends UmbPickerInputContext<
 		super(host, UMB_DOCUMENT_TYPE_ITEM_REPOSITORY_ALIAS, UMB_DOCUMENT_TYPE_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbDocumentTypePickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbDocumentTypePickerInputContext as UmbDocumentTypePickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts
index f9249a9e2b..2a00bdb403 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts
@@ -1,7 +1,7 @@
 import type { UmbDocumentTypeItemModel } from '../../repository/index.js';
 import { UMB_DOCUMENT_TYPE_WORKSPACE_MODAL } from '../../workspace/document-type-workspace.modal-token.js';
 import type { UmbDocumentTypeTreeItemModel } from '../../tree/types.js';
-import { UmbDocumentTypePickerContext } from './input-document-type.context.js';
+import { UmbDocumentTypePickerInputContext } from './input-document-type.context.js';
 import { css, html, customElement, property, state, repeat, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
@@ -117,7 +117,7 @@ export class UmbInputDocumentTypeElement extends UmbFormControlMixin<string | un
 	@state()
 	private _editPath = '';
 
-	#pickerContext = new UmbDocumentTypePickerContext(this);
+	#pickerContext = new UmbDocumentTypePickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/index.ts
index 9c097fa1bf..f2d53bd00f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/index.ts
@@ -1,2 +1 @@
-export { UmbDocumentPickerContext } from './input-document/input-document.context.js';
-export { UmbInputDocumentElement } from './input-document/input-document.element.js';
+export * from './input-document/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/index.ts
new file mode 100644
index 0000000000..a10d6da1cc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/index.ts
@@ -0,0 +1,2 @@
+export * from './input-document.context.js';
+export * from './input-document.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.context.ts
index 7f31b74cf7..1725d91451 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.context.ts
@@ -6,7 +6,7 @@ import type { UmbDocumentTreeItemModel } from '../../tree/types.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbDocumentPickerContext extends UmbPickerInputContext<
+export class UmbDocumentPickerInputContext extends UmbPickerInputContext<
 	UmbDocumentItemModel,
 	UmbDocumentTreeItemModel,
 	UmbDocumentPickerModalData,
@@ -16,3 +16,6 @@ export class UmbDocumentPickerContext extends UmbPickerInputContext<
 		super(host, UMB_DOCUMENT_ITEM_REPOSITORY_ALIAS, UMB_DOCUMENT_PICKER_MODAL, (entry) => entry.unique);
 	}
 }
+
+/** @deprecated Use `UmbDocumentPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbDocumentPickerInputContext as UmbDocumentPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
index 4c24fa30a3..ae0236a47d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
@@ -1,4 +1,4 @@
-import { UmbDocumentPickerContext } from './input-document.context.js';
+import { UmbDocumentPickerInputContext } from './input-document.context.js';
 import {
 	classMap,
 	css,
@@ -139,7 +139,7 @@ export class UmbInputDocumentElement extends UmbFormControlMixin<string | undefi
 	@state()
 	private _items?: Array<UmbDocumentItemModel>;
 
-	#pickerContext = new UmbDocumentPickerContext(this);
+	#pickerContext = new UmbDocumentPickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/language/components/index.ts
index 6f6f6e19f2..4b1be58c00 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/components/index.ts
@@ -1,3 +1,3 @@
 import './input-language/input-language.element.js';
 
-export { UmbInputLanguageElement } from './input-language/input-language.element.js';
+export * from './input-language/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/index.ts b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/index.ts
new file mode 100644
index 0000000000..5d105ea75b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/index.ts
@@ -0,0 +1,2 @@
+export * from './input-language.context.js';
+export * from './input-language.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.context.ts b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.context.ts
index edb02e310f..e9137353bb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.context.ts
@@ -4,8 +4,11 @@ import { UMB_LANGUAGE_PICKER_MODAL } from '../../modals/language-picker/index.js
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 
-export class UmbLanguagePickerContext extends UmbPickerInputContext<UmbLanguageItemModel> {
+export class UmbLanguagePickerInputContext extends UmbPickerInputContext<UmbLanguageItemModel> {
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_LANGUAGE_ITEM_REPOSITORY_ALIAS, UMB_LANGUAGE_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbLanguagePickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbLanguagePickerInputContext as UmbLanguagePickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts
index 7fe689f003..1c86513a70 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts
@@ -1,5 +1,5 @@
 import type { UmbLanguageItemModel } from '../../repository/index.js';
-import { UmbLanguagePickerContext } from './input-language.context.js';
+import { UmbLanguagePickerInputContext } from './input-language.context.js';
 import { css, html, customElement, property, state, repeat, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
@@ -94,7 +94,7 @@ export class UmbInputLanguageElement extends UUIFormControlMixin(UmbLitElement,
 	@state()
 	private _items: Array<UmbLanguageItemModel> = [];
 
-	#pickerContext = new UmbLanguagePickerContext(this);
+	#pickerContext = new UmbLanguagePickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/index.ts
index 5952801b2b..1d853a1027 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/index.ts
@@ -1,3 +1,3 @@
 import './input-media-type/input-media-type.element.js';
 
-export * from './input-media-type/input-media-type.element.js';
+export * from './input-media-type/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/index.ts
new file mode 100644
index 0000000000..4fce89b342
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/index.ts
@@ -0,0 +1,2 @@
+export * from './input-media-type.context.js';
+export * from './input-media-type.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.context.ts
index 61f98a0a1d..a04b433fcd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.context.ts
@@ -9,7 +9,7 @@ import type { UmbMediaTypeTreeItemModel } from '../../tree/types.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbMediaTypePickerContext extends UmbPickerInputContext<
+export class UmbMediaTypePickerInputContext extends UmbPickerInputContext<
 	UmbMediaTypeItemModel,
 	UmbMediaTypeTreeItemModel,
 	UmbMediaTypePickerModalData,
@@ -19,3 +19,6 @@ export class UmbMediaTypePickerContext extends UmbPickerInputContext<
 		super(host, UMB_MEDIA_TYPE_ITEM_REPOSITORY_ALIAS, UMB_MEDIA_TYPE_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbMediaTypePickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbMediaTypePickerInputContext as UmbMediaTypePickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts
index a9c164c06e..0adcf8212a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts
@@ -1,5 +1,5 @@
 import type { UmbMediaTypeItemModel } from '../../repository/index.js';
-import { UmbMediaTypePickerContext } from './input-media-type.context.js';
+import { UmbMediaTypePickerInputContext } from './input-media-type.context.js';
 import { css, html, customElement, property, state, repeat, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
@@ -98,7 +98,7 @@ export class UmbInputMediaTypeElement extends UmbFormControlMixin<string | undef
 	@state()
 	private _editPath = '';
 
-	#pickerContext = new UmbMediaTypePickerContext(this);
+	#pickerContext = new UmbMediaTypePickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/index.ts
index 6d1340ddc3..1c9b9a0aa0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/index.ts
@@ -1 +1,2 @@
+export * from './input-media.context.js';
 export * from './input-media.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.context.ts
index 5a442fd963..fe8fcec48b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.context.ts
@@ -5,7 +5,7 @@ import type { UmbMediaPickerModalData, UmbMediaPickerModalValue } from '../../mo
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbMediaPickerContext extends UmbPickerInputContext<
+export class UmbMediaPickerInputContext extends UmbPickerInputContext<
 	UmbMediaItemModel,
 	UmbMediaItemModel,
 	UmbMediaPickerModalData<UmbMediaItemModel>,
@@ -15,3 +15,6 @@ export class UmbMediaPickerContext extends UmbPickerInputContext<
 		super(host, UMB_MEDIA_ITEM_REPOSITORY_ALIAS, UMB_MEDIA_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbMediaPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbMediaPickerInputContext as UmbMediaPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts
index 3e0d1f331a..e160890053 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts
@@ -1,6 +1,6 @@
 import type { UmbMediaCardItemModel } from '../../modals/index.js';
 import type { UmbMediaItemModel } from '../../repository/index.js';
-import { UmbMediaPickerContext } from './input-media.context.js';
+import { UmbMediaPickerInputContext } from './input-media.context.js';
 import { css, customElement, html, ifDefined, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
@@ -122,7 +122,7 @@ export class UmbInputMediaElement extends UmbFormControlMixin<string | undefined
 	@state()
 	private _cards: Array<UmbMediaCardItemModel> = [];
 
-	#pickerContext = new UmbMediaPickerContext(this);
+	#pickerContext = new UmbMediaPickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/index.ts
index 81f5157a50..8ad97c775b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/index.ts
@@ -1,5 +1,4 @@
 import './input-member-group/input-member-group.element.js';
 
-export * from './input-member-group/input-member-group.element.js';
-
+export * from './input-member-group/index.js';
 export * from './member-group-picker-modal/member-group-picker-modal.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/index.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/index.ts
new file mode 100644
index 0000000000..94be5c4fe4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/index.ts
@@ -0,0 +1,2 @@
+export * from './input-member-group.context.js';
+export * from './input-member-group.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.context.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.context.ts
index 8703697856..bc934b360e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.context.ts
@@ -4,8 +4,11 @@ import { UMB_MEMBER_GROUP_PICKER_MODAL } from '../member-group-picker-modal/memb
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbMemberPickerContext extends UmbPickerInputContext<UmbMemberGroupItemModel> {
+export class UmbMemberGroupPickerInputContext extends UmbPickerInputContext<UmbMemberGroupItemModel> {
 	constructor(host: UmbControllerHostElement) {
 		super(host, UMB_MEMBER_GROUP_ITEM_REPOSITORY_ALIAS, UMB_MEMBER_GROUP_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbMemberGroupPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbMemberGroupPickerInputContext as UmbMemberPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.element.ts
index a43e7aa84b..fe25a89706 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/components/input-member-group/input-member-group.element.ts
@@ -1,5 +1,5 @@
 import type { UmbMemberGroupItemModel } from '../../repository/index.js';
-import { UmbMemberPickerContext } from './input-member-group.context.js';
+import { UmbMemberGroupPickerInputContext } from './input-member-group.context.js';
 import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
@@ -106,7 +106,7 @@ export class UmbInputMemberGroupElement extends UmbFormControlMixin<string | und
 	@state()
 	private _items?: Array<UmbMemberGroupItemModel>;
 
-	#pickerContext = new UmbMemberPickerContext(this);
+	#pickerContext = new UmbMemberGroupPickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/index.ts
index 086cb33bf0..db96fc914e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/index.ts
@@ -1,3 +1,3 @@
 import './input-member-type/input-member-type.element.js';
 
-export * from './input-member-type/input-member-type.element.js';
+export * from './input-member-type/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/index.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/index.ts
new file mode 100644
index 0000000000..e44ddcdd0c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/index.ts
@@ -0,0 +1,2 @@
+export * from './input-member-type.context.js';
+export * from './input-member-type.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.context.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.context.ts
index bd1bafdaa9..0e7a62fd68 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.context.ts
@@ -9,7 +9,7 @@ import type { UmbMemberTypeTreeItemModel } from '../../tree/index.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbMemberTypePickerContext extends UmbPickerInputContext<
+export class UmbMemberTypePickerInputContext extends UmbPickerInputContext<
 	UmbMemberTypeItemModel,
 	UmbMemberTypeTreeItemModel,
 	UmbMemberTypePickerModalData,
@@ -19,3 +19,6 @@ export class UmbMemberTypePickerContext extends UmbPickerInputContext<
 		super(host, UMB_MEMBER_TYPE_ITEM_REPOSITORY_ALIAS, UMB_MEMBER_TYPE_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbMemberTypePickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbMemberTypePickerInputContext as UmbMemberTypePickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts
index e54988609a..dd887b2d66 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts
@@ -1,4 +1,4 @@
-import { UmbMemberTypePickerContext } from './input-member-type.context.js';
+import { UmbMemberTypePickerInputContext } from './input-member-type.context.js';
 import { css, html, customElement, property, state, repeat, when } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -73,7 +73,7 @@ export class UmbInputMemberTypeElement extends UmbFormControlMixin<string | unde
 	@state()
 	private _items?: Array<UmbUniqueItemModel>;
 
-	#pickerContext = new UmbMemberTypePickerContext(this);
+	#pickerContext = new UmbMemberTypePickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/index.ts
index ebf56a01fa..8e90e30981 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/index.ts
@@ -1,6 +1,6 @@
 import './input-member/input-member.element.js';
 
-export * from './input-member/input-member.element.js';
+export * from './input-member/index.js';
 export * from './member-picker-modal/member-picker-modal.element.js';
 
 export { UMB_MEMBER_PICKER_MODAL } from './member-picker-modal/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/index.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/index.ts
new file mode 100644
index 0000000000..f6960e6fae
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/index.ts
@@ -0,0 +1,2 @@
+export * from './input-member.context.js';
+export * from './input-member.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.context.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.context.ts
index feb383067c..0383774ddf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.context.ts
@@ -4,8 +4,11 @@ import { UMB_MEMBER_PICKER_MODAL } from '../member-picker-modal/member-picker-mo
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbMemberPickerContext extends UmbPickerInputContext<UmbMemberItemModel> {
+export class UmbMemberPickerInputContext extends UmbPickerInputContext<UmbMemberItemModel> {
 	constructor(host: UmbControllerHostElement) {
 		super(host, UMB_MEMBER_ITEM_REPOSITORY_ALIAS, UMB_MEMBER_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbMemberPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbMemberPickerInputContext as UmbMemberPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts
index 65a9d3eb64..90ce063c4d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.element.ts
@@ -1,5 +1,5 @@
 import type { UmbMemberItemModel } from '../../repository/index.js';
-import { UmbMemberPickerContext } from './input-member.context.js';
+import { UmbMemberPickerInputContext } from './input-member.context.js';
 import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
@@ -108,7 +108,7 @@ export class UmbInputMemberElement extends UmbFormControlMixin<string | undefine
 	@state()
 	private _items?: Array<UmbMemberItemModel>;
 
-	#pickerContext = new UmbMemberPickerContext(this);
+	#pickerContext = new UmbMemberPickerInputContext(this);
 
 	constructor() {
 		super();
@@ -188,6 +188,7 @@ export class UmbInputMemberElement extends UmbFormControlMixin<string | undefine
 		if (!item.unique) return nothing;
 		return html`
 			<uui-ref-node name=${item.name} id=${item.unique}>
+				${this.#renderIcon(item)}
 				<uui-action-bar slot="actions">
 					${this.#renderOpenButton(item)}
 					<uui-button @click=${() => this.#onRemove(item)} label=${this.localize.term('general_remove')}></uui-button>
@@ -196,6 +197,11 @@ export class UmbInputMemberElement extends UmbFormControlMixin<string | undefine
 		`;
 	}
 
+	#renderIcon(item: UmbMemberItemModel) {
+		if (!item.memberType.icon) return;
+		return html`<umb-icon slot="icon" name=${item.memberType.icon}></umb-icon>`;
+	}
+
 	#renderOpenButton(item: UmbMemberItemModel) {
 		if (!this.showOpenButton) return nothing;
 		return html`
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
index 01f4a23173..7eb0d0240f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
@@ -1,10 +1,10 @@
 import { UmbPackageRepository } from '../../package/repository/index.js';
 import type { UmbCreatedPackageDefinition } from '../../types.js';
-import { UmbDictionaryPickerContext } from '@umbraco-cms/backoffice/dictionary';
-import { UmbPartialViewPickerContext } from '@umbraco-cms/backoffice/partial-view';
-import { UmbScriptPickerContext } from '@umbraco-cms/backoffice/script';
-import { UmbStylesheetPickerContext } from '@umbraco-cms/backoffice/stylesheet';
-import { UmbTemplatePickerContext } from '@umbraco-cms/backoffice/template';
+import { UmbDictionaryPickerInputContext } from '@umbraco-cms/backoffice/dictionary';
+import { UmbPartialViewPickerInputContext } from '@umbraco-cms/backoffice/partial-view';
+import { UmbScriptPickerInputContext } from '@umbraco-cms/backoffice/script';
+import { UmbStylesheetPickerInputContext } from '@umbraco-cms/backoffice/stylesheet';
+import { UmbTemplatePickerInputContext } from '@umbraco-cms/backoffice/template';
 import type { UmbDataTypeInputElement } from '@umbraco-cms/backoffice/data-type';
 import type { UmbInputLanguageElement } from '@umbraco-cms/backoffice/language';
 import {
@@ -307,7 +307,7 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 				<div slot="editor">
 					<umb-input-entity
 						.getIcon=${() => 'icon-book-alt'}
-						.pickerContext=${UmbDictionaryPickerContext}
+						.pickerContext=${UmbDictionaryPickerInputContext}
 						.selection=${this._package.dictionaryItems ?? []}
 						@change=${this.#onDictionaryChange}>
 					</umb-input-entity>
@@ -344,7 +344,7 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 				<div slot="editor">
 					<umb-input-entity
 						.getIcon=${() => 'icon-newspaper'}
-						.pickerContext=${UmbTemplatePickerContext}
+						.pickerContext=${UmbTemplatePickerInputContext}
 						.selection=${this._package.templates ?? []}
 						@change=${this.#onTemplateChange}>
 					</umb-input-entity>
@@ -368,7 +368,7 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 				<div slot="editor">
 					<umb-input-entity
 						.getIcon=${() => 'icon-brush-alt'}
-						.pickerContext=${UmbStylesheetPickerContext}
+						.pickerContext=${UmbStylesheetPickerInputContext}
 						.selection=${this._package.stylesheets.map((path) => this.#serverFilePathUniqueSerializer.toUnique(path)) ??
 						[]}
 						@change=${this.#onStylesheetsChange}>
@@ -393,7 +393,7 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 				<div slot="editor">
 					<umb-input-entity
 						.getIcon=${() => 'icon-diploma'}
-						.pickerContext=${UmbScriptPickerContext}
+						.pickerContext=${UmbScriptPickerInputContext}
 						.selection=${this._package.scripts.map((path) => this.#serverFilePathUniqueSerializer.toUnique(path)) ?? []}
 						@change=${this.#onScriptsChange}>
 					</umb-input-entity>
@@ -417,7 +417,7 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 				<div slot="editor">
 					<umb-input-entity
 						.getIcon=${() => 'icon-notepad'}
-						.pickerContext=${UmbPartialViewPickerContext}
+						.pickerContext=${UmbPartialViewPickerInputContext}
 						.selection=${this._package.partialViews.map((path) =>
 							this.#serverFilePathUniqueSerializer.toUnique(path),
 						) ?? []}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts
index 7d576979b9..1e11a7acfc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts
@@ -1,7 +1,7 @@
 import type { UmbContentPickerDynamicRoot } from '../../types.js';
 import type { UmbContentPickerDocumentRootOriginModalData } from './index.js';
 import { html, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit';
-import { UmbDocumentPickerContext } from '@umbraco-cms/backoffice/document';
+import { UmbDocumentPickerInputContext } from '@umbraco-cms/backoffice/document';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import type { ManifestDynamicRootOrigin } from '@umbraco-cms/backoffice/extension-registry';
 
@@ -10,7 +10,7 @@ export class UmbDynamicRootOriginPickerModalModalElement extends UmbModalBaseEle
 	@state()
 	private _origins: Array<ManifestDynamicRootOrigin> = [];
 
-	#documentPickerContext = new UmbDocumentPickerContext(this);
+	#documentPickerContext = new UmbDocumentPickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts
index 18cf12a070..3546497199 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts
@@ -1,6 +1,6 @@
 import type { UmbContentPickerDynamicRootQueryStep } from '../../types.js';
 import type { UmbContentPickerDocumentRootQueryStepModalData } from './index.js';
-import { UmbDocumentTypePickerContext } from '@umbraco-cms/backoffice/document-type';
+import { UmbDocumentTypePickerInputContext } from '@umbraco-cms/backoffice/document-type';
 import { UmbId } from '@umbraco-cms/backoffice/id';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { html, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit';
@@ -11,7 +11,7 @@ export class UmbDynamicRootQueryStepPickerModalModalElement extends UmbModalBase
 	@state()
 	private _querySteps: Array<ManifestDynamicRootQueryStep> = [];
 
-	#documentTypePickerContext = new UmbDocumentTypePickerContext(this);
+	#documentTypePickerContext = new UmbDocumentTypePickerInputContext(this);
 
 	override connectedCallback() {
 		super.connectedCallback();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.context.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.context.ts
index 19bd919bec..0b73c610b2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.context.ts
@@ -5,7 +5,7 @@ import type { UmbStaticFilePickerModalData, UmbStaticFilePickerModalValue } from
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbStaticFilePickerContext extends UmbPickerInputContext<
+export class UmbStaticFilePickerInputContext extends UmbPickerInputContext<
 	UmbStaticFileItemModel,
 	UmbStaticFileItemModel,
 	UmbStaticFilePickerModalData,
@@ -15,3 +15,6 @@ export class UmbStaticFilePickerContext extends UmbPickerInputContext<
 		super(host, UMB_STATIC_FILE_ITEM_REPOSITORY_ALIAS, UMB_STATIC_FILE_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbStaticFilePickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbStaticFilePickerInputContext as UmbStaticFilePickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts
index cc3b589f18..9e42a0b6f7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts
@@ -1,5 +1,5 @@
 import type { UmbStaticFileItemModel } from '../../repository/item/types.js';
-import { UmbStaticFilePickerContext } from './input-static-file.context.js';
+import { UmbStaticFilePickerInputContext } from './input-static-file.context.js';
 import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -79,7 +79,7 @@ export class UmbInputStaticFileElement extends UmbFormControlMixin<string | unde
 	@state()
 	private _items?: Array<UmbStaticFileItemModel>;
 
-	#pickerContext = new UmbStaticFilePickerContext(this);
+	#pickerContext = new UmbStaticFilePickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/global-components/input-partial-view/input-partial-view.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/global-components/input-partial-view/input-partial-view.context.ts
index 44c7498ef5..754ef1e481 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/global-components/input-partial-view/input-partial-view.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/global-components/input-partial-view/input-partial-view.context.ts
@@ -5,7 +5,7 @@ import type { UmbPartialViewTreeItemModel } from '../../tree/types.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 
-export class UmbPartialViewPickerContext extends UmbPickerInputContext<
+export class UmbPartialViewPickerInputContext extends UmbPickerInputContext<
 	UmbPartialViewItemModel,
 	UmbPartialViewTreeItemModel
 > {
@@ -13,3 +13,6 @@ export class UmbPartialViewPickerContext extends UmbPickerInputContext<
 		super(host, UMB_PARTIAL_VIEW_ITEM_REPOSITORY_ALIAS, UMB_PARTIAL_VIEW_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbPartialViewPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbPartialViewPickerInputContext as UmbPartialViewPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/global-components/input-script/input-script.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/global-components/input-script/input-script.context.ts
index cf3961fc41..da678beeb5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/global-components/input-script/input-script.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/global-components/input-script/input-script.context.ts
@@ -4,8 +4,11 @@ import type { UmbScriptItemModel, UmbScriptTreeItemModel } from '../../index.js'
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbScriptPickerContext extends UmbPickerInputContext<UmbScriptItemModel, UmbScriptTreeItemModel> {
+export class UmbScriptPickerInputContext extends UmbPickerInputContext<UmbScriptItemModel, UmbScriptTreeItemModel> {
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_SCRIPT_ITEM_REPOSITORY_ALIAS, UMB_SCRIPT_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbScriptPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbScriptPickerInputContext as UmbScriptPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.context.ts
index 06b93a6bca..abc9f0743f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.context.ts
@@ -4,7 +4,7 @@ import { UMB_STYLESHEET_PICKER_MODAL } from './stylesheet-picker-modal.token.js'
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbStylesheetPickerContext extends UmbPickerInputContext<UmbStylesheetItemModel> {
+export class UmbStylesheetPickerInputContext extends UmbPickerInputContext<UmbStylesheetItemModel> {
 	constructor(host: UmbControllerHost) {
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 		// @ts-ignore
@@ -12,3 +12,6 @@ export class UmbStylesheetPickerContext extends UmbPickerInputContext<UmbStylesh
 		super(host, UMB_STYLESHEET_ITEM_REPOSITORY_ALIAS, UMB_STYLESHEET_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbStylesheetPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbStylesheetPickerInputContext as UmbStylesheetPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.element.ts
index 96f3e710a3..6e6708ab8a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/global-components/stylesheet-input/stylesheet-input.element.ts
@@ -1,5 +1,5 @@
 import type { UmbStylesheetItemModel } from '../../types.js';
-import { UmbStylesheetPickerContext } from './stylesheet-input.context.js';
+import { UmbStylesheetPickerInputContext } from './stylesheet-input.context.js';
 import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -73,7 +73,7 @@ export class UmbStylesheetInputElement extends UUIFormControlMixin(UmbLitElement
 	@state()
 	private _items: Array<UmbStylesheetItemModel> = [];
 
-	#pickerContext = new UmbStylesheetPickerContext(this);
+	#pickerContext = new UmbStylesheetPickerInputContext(this);
 
 	constructor() {
 		super();
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/global-components/input-template/input-template.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/global-components/input-template/input-template.context.ts
index 6f70a59783..65d9510c65 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/global-components/input-template/input-template.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/global-components/input-template/input-template.context.ts
@@ -4,10 +4,13 @@ import type { UmbTemplateItemModel } from '../../repository/index.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbTemplatePickerContext extends UmbPickerInputContext<UmbTemplateItemModel> {
+export class UmbTemplatePickerInputContext extends UmbPickerInputContext<UmbTemplateItemModel> {
 	constructor(host: UmbControllerHost) {
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 		// @ts-ignore
 		super(host, UMB_TEMPLATE_ITEM_REPOSITORY_ALIAS, UMB_TEMPLATE_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbTemplatePickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbTemplatePickerInputContext as UmbTemplatePickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/index.ts
index 94dd470899..0988eef644 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/index.ts
@@ -1,5 +1,5 @@
 import './input-user-group/user-group-input.element.js';
 import './user-group-ref/user-group-ref.element.js';
 
-export * from './input-user-group/user-group-input.element.js';
-export * from './user-group-ref/user-group-ref.element.js';
+export * from './input-user-group/index.js';
+export * from './user-group-ref/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/index.ts
new file mode 100644
index 0000000000..d70ea5b90b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/index.ts
@@ -0,0 +1,2 @@
+export * from './user-group-input.context.js';
+export * from './user-group-input.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.context.ts
index 2cfd308ca7..bc768f0f88 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.context.ts
@@ -3,8 +3,11 @@ import { UMB_USER_GROUP_PICKER_MODAL } from '../../modals/user-group-picker/user
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbUserGroupPickerContext extends UmbPickerInputContext<UmbUserGroupItemModel> {
+export class UmbUserGroupPickerInputContext extends UmbPickerInputContext<UmbUserGroupItemModel> {
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_USER_GROUP_ITEM_REPOSITORY_ALIAS, UMB_USER_GROUP_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbUserGroupPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbUserGroupPickerInputContext as UmbUserGroupPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts
index 0b947b9338..dd376a64a1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts
@@ -1,6 +1,6 @@
 import { UMB_USER_GROUP_ENTITY_TYPE } from '../../entity.js';
 import type { UmbUserGroupItemModel } from '../../repository/index.js';
-import { UmbUserGroupPickerContext } from './user-group-input.context.js';
+import { UmbUserGroupPickerInputContext } from './user-group-input.context.js';
 import { css, html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -75,7 +75,7 @@ export class UmbUserGroupInputElement extends UUIFormControlMixin(UmbLitElement,
 	@state()
 	private _items?: Array<UmbUserGroupItemModel>;
 
-	#pickerContext = new UmbUserGroupPickerContext(this);
+	#pickerContext = new UmbUserGroupPickerInputContext(this);
 
 	@state()
 	private _editUserGroupPath = '';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/user-group-ref/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/user-group-ref/index.ts
new file mode 100644
index 0000000000..ad8f153384
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/user-group-ref/index.ts
@@ -0,0 +1 @@
+export * from './user-group-ref.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/index.ts
index 416c579290..6f97b68e0a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/index.ts
@@ -2,5 +2,5 @@ import './user-input/user-input.element.js';
 import './user-document-start-node/user-document-start-node.element.js';
 import './user-media-start-node/user-media-start-node.element.js';
 
-export * from './user-input/user-input.element.js';
+export * from './user-input/index.js';
 export * from '../../user-permission/components/input-user-permission-verb/input-user-permission-verb.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/index.ts
new file mode 100644
index 0000000000..04a7d37aa5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/index.ts
@@ -0,0 +1,2 @@
+export * from './user-input.context.js';
+export * from './user-input.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.context.ts
index a04b1c6309..393ac4214a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.context.ts
@@ -4,8 +4,11 @@ import { UMB_USER_PICKER_MODAL } from '../../modals/user-picker/user-picker-moda
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbUserPickerContext extends UmbPickerInputContext<UmbUserDetailModel> {
+export class UmbUserPickerInputContext extends UmbPickerInputContext<UmbUserDetailModel> {
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_USER_ITEM_REPOSITORY_ALIAS, UMB_USER_PICKER_MODAL);
 	}
 }
+
+/** @deprecated Use `UmbUserPickerInputContext` instead. This method will be removed in Umbraco 15. */
+export { UmbUserPickerInputContext as UmbUserPickerContext };
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts
index 38c4a3beb0..0ca83e9a7d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts
@@ -1,5 +1,5 @@
 import type { UmbUserItemModel } from '../../repository/index.js';
-import { UmbUserPickerContext } from './user-input.context.js';
+import { UmbUserPickerInputContext } from './user-input.context.js';
 import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { splitStringToArray } from '@umbraco-cms/backoffice/utils';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
@@ -92,7 +92,7 @@ export class UmbUserInputElement extends UUIFormControlMixin(UmbLitElement, '')
 	@state()
 	private _items?: Array<UmbUserItemModel>;
 
-	#pickerContext = new UmbUserPickerContext(this);
+	#pickerContext = new UmbUserPickerInputContext(this);
 
 	constructor() {
 		super();