diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 10bff7284d..5eac58763e 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -28,7 +28,7 @@
 		"./content-type": "./dist-cms/packages/core/content-type/index.js",
 		"./content": "./dist-cms/packages/core/content/index.js",
 		"./culture": "./dist-cms/packages/core/culture/index.js",
-		"./picker": "./dist-cms/packages/core/picker/index.js",
+		"./picker-modal": "./dist-cms/packages/core/picker-modal/index.js",
 		"./current-user": "./dist-cms/packages/user/current-user/index.js",
 		"./data-type": "./dist-cms/packages/data-type/index.js",
 		"./debug": "./dist-cms/packages/core/debug/index.js",
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/picker-modal.context.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/picker-modal.context.token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/picker-modal.context.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/picker-modal.context.token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/picker-modal.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/picker-modal.context.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/picker-modal.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/picker-modal.context.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/search/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/manager/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/manager/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/picker-modal-search.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/manager/picker-modal-search.manager.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/picker-modal-search.manager.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/manager/picker-modal-search.manager.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/manager/types.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/types.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/manager/types.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/picker-modal-search-result.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/picker-modal-search-result.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/search/picker-modal-search-result.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/picker-modal-search-result.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/picker-modal-search.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/picker-modal-search.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/search/picker-modal-search.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/picker-modal-search.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/result-item/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/result-item/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/picker-search-result-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/result-item/picker-search-result-item.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/picker-search-result-item.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/picker-modal/search/result-item/picker-search-result-item.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.context.ts
index 4c7cc0c227..6d3c1f0cde 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker/tree-picker-modal.context.ts
@@ -1,4 +1,4 @@
-import { UmbPickerModalContext } from '@umbraco-cms/backoffice/picker';
+import { UmbPickerModalContext } from '@umbraco-cms/backoffice/picker-modal';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 export class UmbTreePickerModalContext extends UmbPickerModalContext {
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index 13058d558f..506f62fb6f 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -54,7 +54,7 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 			"@umbraco-cms/backoffice/content-type": ["./src/packages/core/content-type/index.ts"],
 			"@umbraco-cms/backoffice/content": ["./src/packages/core/content/index.ts"],
 			"@umbraco-cms/backoffice/culture": ["./src/packages/core/culture/index.ts"],
-			"@umbraco-cms/backoffice/picker": ["./src/packages/core/picker/index.ts"],
+			"@umbraco-cms/backoffice/picker-modal": ["./src/packages/core/picker-modal/index.ts"],
 			"@umbraco-cms/backoffice/current-user": ["./src/packages/user/current-user/index.ts"],
 			"@umbraco-cms/backoffice/data-type": ["./src/packages/data-type/index.ts"],
 			"@umbraco-cms/backoffice/debug": ["./src/packages/core/debug/index.ts"],