diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-document-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts
similarity index 84%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-document-picker.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts
index 9ffb3e3291..930ff8c7c1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-document-picker.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts
@@ -2,7 +2,7 @@ import { html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { UmbLitElement } from '@umbraco-cms/element';
 import type { UmbInputDocumentPickerElement } from 'src/backoffice/shared/components/input-document-picker/input-document-picker.element';
-import '../../../../shared/components/input-document-picker/input-document-picker.element';
+import '../../../components/input-document-picker/input-document-picker.element';
 import type { DataTypePropertyData } from '@umbraco-cms/models';
 
 @customElement('umb-property-editor-ui-document-picker')
@@ -23,30 +23,27 @@ export class UmbPropertyEditorUIContentPickerElement extends UmbLitElement {
 		return this._value;
 	}
 	public set value(value: Array<string>) {
-			this._value = value || [];
+		this._value = value || [];
 	}
 
 	@property({ type: Array, attribute: false })
 	public set config(config: Array<DataTypePropertyData>) {
-		const validationLimit = config.find(x => x.alias === 'validationLimit');
+		const validationLimit = config.find((x) => x.alias === 'validationLimit');
 
 		this._limitMin = (validationLimit?.value as any).min;
 		this._limitMax = (validationLimit?.value as any).max;
 	}
 
 	@state()
-	private _limitMin?:number;
+	private _limitMin?: number;
 	@state()
-	private _limitMax?:number;
-
+	private _limitMax?: number;
 
 	private _onChange(event: CustomEvent) {
 		this.value = (event.target as UmbInputDocumentPickerElement).selectedKeys;
 		this.dispatchEvent(new CustomEvent('property-value-change'));
 	}
 
-
-
 	// TODO: Implement mandatory?
 	render() {
 		return html`
@@ -55,10 +52,10 @@ export class UmbPropertyEditorUIContentPickerElement extends UmbLitElement {
 				.selectedKeys=${this._value}
 				.min=${this._limitMin}
 				.max=${this._limitMax}
-			>Add</umb-input-document-picker>
+				>Add</umb-input-document-picker
+			>
 		`;
 	}
-
 }
 
 export default UmbPropertyEditorUIContentPickerElement;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-document-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.stories.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-document-picker.stories.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.stories.ts
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/manifests.ts
index ba0e0873b7..801276124c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/manifests.ts
@@ -1,5 +1,5 @@
 import { manifest as colorPicker } from './color-picker/manifests';
-import { manifest as contentPicker } from './content-picker/manifests';
+import { manifest as documentPicker } from './document-picker/manifests';
 import { manifest as datePicker } from './date-picker/manifests';
 import { manifest as eyeDropper } from './eye-dropper/manifests';
 import { manifest as multiUrlPicker } from './multi-url-picker/manifests';
@@ -31,7 +31,7 @@ import type { ManifestPropertyEditorUI } from '@umbraco-cms/models';
 
 export const manifests: Array<ManifestPropertyEditorUI> = [
 	colorPicker,
-	contentPicker,
+	documentPicker,
 	datePicker,
 	eyeDropper,
 	multiUrlPicker,
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts
index 949dd630fc..f1f670d8ca 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts
@@ -15,13 +15,13 @@ import type { UserDetails } from '@umbraco-cms/models';
 import { UmbModalService } from 'src/core/modal';
 
 import '../../../../auth/components/input-user-group/input-user-group.element';
-import '../../../shared/property-editors/uis/content-picker/property-editor-ui-document-picker.element';
+import '../../../shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element';
 import '../../../shared/components/workspace/workspace-layout/workspace-layout.element';
 import { UmbLitElement } from '@umbraco-cms/element';
 import type { UmbWorkspaceEntityElement } from 'src/backoffice/shared/components/workspace/workspace-entity-element.interface';
 
 @customElement('umb-user-workspace')
-export class UmbUserWorkspaceElement extends UmbLitElement implements UmbWorkspaceEntityElement{
+export class UmbUserWorkspaceElement extends UmbLitElement implements UmbWorkspaceEntityElement {
 	static styles = [
 		UUITextStyles,
 		css`