diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/picker.context.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/picker.context.token.ts
index cb8321169c..3973df1bfa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/picker.context.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/picker.context.token.ts
@@ -1,4 +1,4 @@
 import type { UmbPickerContext } from './picker.context.js';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 
-export const UMB_PICKER_CONTEXT = new UmbContextToken<UmbPickerContext>('UmbPickerModalContext');
+export const UMB_PICKER_CONTEXT = new UmbContextToken<UmbPickerContext>('UmbPickerContext');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/picker-search-result.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/picker-search-result.element.ts
index 675843bcb9..2d7881da43 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/picker-search-result.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/picker-search-result.element.ts
@@ -6,9 +6,9 @@ import type { UmbSearchRequestArgs } from '@umbraco-cms/backoffice/search';
 import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 import type { ManifestPickerSearchResultItem } from '@umbraco-cms/backoffice/extension-registry';
 
-const elementName = 'umb-picker-modal-search-result';
+const elementName = 'umb-picker-search-result';
 @customElement(elementName)
-export class UmbPickerModalSearchResultElement extends UmbLitElement {
+export class UmbPickerSearchResultElement extends UmbLitElement {
 	@state()
 	_query?: UmbSearchRequestArgs;
 
@@ -18,23 +18,23 @@ export class UmbPickerModalSearchResultElement extends UmbLitElement {
 	@state()
 	_items: UmbEntityModel[] = [];
 
-	#pickerModalContext?: UmbPickerContext;
+	#pickerContext?: UmbPickerContext;
 
 	constructor() {
 		super();
 
 		this.consumeContext(UMB_PICKER_CONTEXT, (context) => {
-			this.#pickerModalContext = context;
+			this.#pickerContext = context;
 
-			this.observe(this.#pickerModalContext.search.query, (query) => {
+			this.observe(this.#pickerContext.search.query, (query) => {
 				this._query = query;
 			});
 
-			this.observe(this.#pickerModalContext.search.searching, (query) => {
+			this.observe(this.#pickerContext.search.searching, (query) => {
 				this._searching = query;
 			});
 
-			this.observe(this.#pickerModalContext.search.resultItems, (items) => {
+			this.observe(this.#pickerContext.search.resultItems, (items) => {
 				this._items = items;
 			});
 		});
@@ -70,6 +70,6 @@ export class UmbPickerModalSearchResultElement extends UmbLitElement {
 
 declare global {
 	interface HTMLElementTagNameMap {
-		[elementName]: UmbPickerModalSearchResultElement;
+		[elementName]: UmbPickerSearchResultElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.element.ts
index 36f0a9c7e9..f082c8d041 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.element.ts
@@ -146,8 +146,8 @@ export class UmbTreePickerModalElement<TreeItemType extends UmbTreeItemModelBase
 	}
 	#renderSearch() {
 		return html`
-			<umb-picker-modal-search></umb-picker-modal-search>
-			<umb-picker-modal-search-result></umb-picker-modal-search-result>
+			<umb-picker-search></umb-picker-search>
+			<umb-picker-search-result></umb-picker-search-result>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/member-picker-modal/member-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/member-picker-modal/member-picker-modal.element.ts
index a8ee6e5a49..959607265c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/components/member-picker-modal/member-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/components/member-picker-modal/member-picker-modal.element.ts
@@ -66,8 +66,8 @@ export class UmbMemberPickerModalElement extends UmbModalBaseElement<
 		return html`
 			<umb-body-layout headline=${this.localize.term('defaultdialogs_selectMembers')}>
 				<uui-box>
-					<umb-picker-modal-search></umb-picker-modal-search>
-					<umb-picker-modal-search-result></umb-picker-modal-search-result>
+					<umb-picker-search></umb-picker-search>
+					<umb-picker-search-result></umb-picker-search-result>
 					${this.#renderItems()}</uui-box
 				>
 				${this.#renderActions()}