diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/index.ts
index 0c807f6a81..0ed1de0abd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/index.ts
@@ -1,3 +1,3 @@
 export * from './types.js';
-export * from './rename.action.js';
-export * from './rename-repository-base.js';
+export * from './rename-server-file.action.js';
+export * from './rename-server-file-repository-base.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/manifests.ts
index cc8de2f35f..35a3f6e382 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/manifests.ts
@@ -1,4 +1,4 @@
 import { manifests as renameModalManifests } from './modal/manifests.js';
-import { manifest as renameKindManifest } from './rename.action.kind.js';
+import { manifest as renameKindManifest } from './rename-server-file.action.kind.js';
 
 export const manifests = [...renameModalManifests, renameKindManifest];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/manifests.ts
index 1f5eb8c71d..2b5695fff3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/manifests.ts
@@ -1,12 +1,12 @@
 import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
 
-export const UMB_RENAME_MODAL_ALIAS = 'Umb.Modal.Rename';
+export const UMB_RENAME_SERVER_FILE_MODAL_ALIAS = 'Umb.Modal.ServerFile.Rename';
 
 export const manifests: Array<ManifestModal> = [
 	{
 		type: 'modal',
-		alias: UMB_RENAME_MODAL_ALIAS,
-		name: 'Rename Modal',
-		js: () => import('./rename-modal.element.js'),
+		alias: UMB_RENAME_SERVER_FILE_MODAL_ALIAS,
+		name: 'Rename Server File Modal',
+		js: () => import('./rename-server-file-modal.element.js'),
 	},
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-modal.token.ts
deleted file mode 100644
index 227e88223e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-modal.token.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { UMB_RENAME_MODAL_ALIAS } from './manifests.js';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
-
-export interface UmbRenameModalData {
-	renameRepositoryAlias: string;
-	itemRepositoryAlias: string;
-	unique: string;
-}
-
-export interface UmbRenameModalValue {}
-
-export const UMB_RENAME_MODAL = new UmbModalToken<UmbRenameModalData, UmbRenameModalValue>(UMB_RENAME_MODAL_ALIAS, {
-	modal: {
-		type: 'sidebar',
-		size: 'small',
-	},
-});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-server-file-modal.element.ts
similarity index 92%
rename from src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-server-file-modal.element.ts
index 183db8efc0..204bfb5d37 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-server-file-modal.element.ts
@@ -1,5 +1,5 @@
-import type { UmbRenameRepository } from '../types.js';
-import type { UmbRenameModalData, UmbRenameModalValue } from './rename-modal.token.js';
+import type { UmbRenameServerFileRepository } from '../types.js';
+import type { UmbRenameModalData, UmbRenameServerFileModalValue } from './rename-server-file-modal.token.js';
 import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
 import { html, customElement, css, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
@@ -9,10 +9,10 @@ import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registr
 import type { UmbItemRepository } from '@umbraco-cms/backoffice/repository';
 
 @customElement('umb-rename-modal')
-export class UmbRenameModalElement extends UmbModalBaseElement<UmbRenameModalData, UmbRenameModalValue> {
+export class UmbRenameModalElement extends UmbModalBaseElement<UmbRenameModalData, UmbRenameServerFileModalValue> {
 	// TODO: make base type for item and detail models
 	#itemRepository?: UmbItemRepository<any>;
-	#renameRepository?: UmbRenameRepository<any>;
+	#renameRepository?: UmbRenameServerFileRepository<any>;
 	#init?: Promise<unknown>;
 
 	@state()
@@ -46,7 +46,7 @@ export class UmbRenameModalElement extends UmbModalBaseElement<UmbRenameModalDat
 				this.data.renameRepositoryAlias,
 				[this],
 				(permitted, ctrl) => {
-					this.#renameRepository = permitted ? (ctrl.api as UmbRenameRepository<any>) : undefined;
+					this.#renameRepository = permitted ? (ctrl.api as UmbRenameServerFileRepository<any>) : undefined;
 				},
 			).asPromise(),
 		]);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-server-file-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-server-file-modal.token.ts
new file mode 100644
index 0000000000..42357c60f4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/rename-server-file-modal.token.ts
@@ -0,0 +1,20 @@
+import { UMB_RENAME_SERVER_FILE_MODAL_ALIAS } from './manifests.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+
+export interface UmbRenameModalData {
+	renameRepositoryAlias: string;
+	itemRepositoryAlias: string;
+	unique: string;
+}
+
+export interface UmbRenameServerFileModalValue {}
+
+export const UMB_RENAME_SERVER_FILE_MODAL = new UmbModalToken<UmbRenameModalData, UmbRenameServerFileModalValue>(
+	UMB_RENAME_SERVER_FILE_MODAL_ALIAS,
+	{
+		modal: {
+			type: 'sidebar',
+			size: 'small',
+		},
+	},
+);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-repository-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file-repository-base.ts
similarity index 59%
rename from src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-repository-base.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file-repository-base.ts
index 756c4ff943..10f3f3c31e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-repository-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file-repository-base.ts
@@ -1,14 +1,14 @@
+import type { UmbRenameServerFileDataSource, UmbRenameServerFileDataSourceConstructor } from './types.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
 import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
 import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
-import type { UmbRenameDataSource, UmbRenameDataSourceConstructor } from '@umbraco-cms/backoffice/entity-action';
-import type { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 
-export abstract class UmbRenameRepositoryBase<DetailModelType extends { unique: string }> extends UmbRepositoryBase {
-	#renameSource: UmbRenameDataSource<DetailModelType>;
+export abstract class UmbRenameServerFileRepositoryBase<
+	DetailModelType extends { unique: string },
+> extends UmbRepositoryBase {
+	#renameSource: UmbRenameServerFileDataSource<DetailModelType>;
 
-	constructor(host: UmbControllerHost, detailSource: UmbRenameDataSourceConstructor<DetailModelType>) {
+	constructor(host: UmbControllerHost, detailSource: UmbRenameServerFileDataSourceConstructor<DetailModelType>) {
 		super(host);
 		this.#renameSource = new detailSource(host);
 	}
@@ -18,7 +18,7 @@ export abstract class UmbRenameRepositoryBase<DetailModelType extends { unique:
 	 * @param {string} unique
 	 * @param {string} name
 	 * @return {*}
-	 * @memberof UmbRenameRepositoryBase
+	 * @memberof UmbRenameServerFileRepositoryBase
 	 */
 	async rename(unique: string, name: string) {
 		if (!unique) throw new Error('Unique is missing');
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.kind.ts
similarity index 76%
rename from src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename.action.kind.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.kind.ts
index 4f253ef7d5..7af4436044 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename.action.kind.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.kind.ts
@@ -3,14 +3,14 @@ import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extensio
 
 export const manifest: UmbBackofficeManifestKind = {
 	type: 'kind',
-	alias: 'Umb.Kind.EntityAction.Rename',
-	matchKind: 'rename',
+	alias: 'Umb.Kind.EntityAction.ServerFile.Rename',
+	matchKind: 'renameServerFile',
 	matchType: 'entityAction',
 	manifest: {
 		...UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST.manifest,
 		type: 'entityAction',
-		kind: 'rename',
-		api: () => import('./rename.action.js'),
+		kind: 'renameServerFile',
+		api: () => import('./rename-server-file.action.js'),
 		weight: 200,
 		forEntityTypes: [],
 		meta: {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.ts
similarity index 87%
rename from src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename.action.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.ts
index 9a1e64c34a..bd7fe620ad 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.ts
@@ -1,4 +1,4 @@
-import { UMB_RENAME_MODAL } from './modal/rename-modal.token.js';
+import { UMB_RENAME_SERVER_FILE_MODAL } from './modal/rename-server-file-modal.token.js';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import type { MetaEntityActionRenameKind } from '@umbraco-cms/backoffice/extension-registry';
@@ -10,7 +10,7 @@ export class UmbRenameEntityAction extends UmbEntityActionBase<MetaEntityActionR
 		if (!this.args.unique) throw new Error('Unique is required to rename an entity');
 
 		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-		const modalContext = modalManager.open(this, UMB_RENAME_MODAL, {
+		const modalContext = modalManager.open(this, UMB_RENAME_SERVER_FILE_MODAL, {
 			data: {
 				unique: this.args.unique,
 				renameRepositoryAlias: this.args.meta.renameRepositoryAlias,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/types.ts
index c4c6d20d62..c31693dae4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/types.ts
@@ -1,14 +1,14 @@
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbDataSourceResponse } from '@umbraco-cms/backoffice/repository';
 
-export interface UmbRenameRepository<DetailType extends { unique: string }> {
+export interface UmbRenameServerFileRepository<DetailType extends { unique: string }> {
 	rename(unique: string, name: string): Promise<UmbDataSourceResponse<DetailType>>;
 }
 
-export interface UmbRenameDataSourceConstructor<DetailType extends { unique: string }> {
-	new (host: UmbControllerHost): UmbRenameDataSource<DetailType>;
+export interface UmbRenameServerFileDataSourceConstructor<DetailType extends { unique: string }> {
+	new (host: UmbControllerHost): UmbRenameServerFileDataSource<DetailType>;
 }
 
-export interface UmbRenameDataSource<DetailType extends { unique: string }> {
+export interface UmbRenameServerFileDataSource<DetailType extends { unique: string }> {
 	rename(unique: string, name: string): Promise<UmbDataSourceResponse<DetailType>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.repository.ts
index dcfb237b73..93545cd8d8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.repository.ts
@@ -1,11 +1,12 @@
+import { UMB_PARTIAL_VIEW_DETAIL_STORE_CONTEXT } from '../../repository/index.js';
 import type { UmbPartialViewDetailModel } from '../../types.js';
 import { UmbRenamePartialViewServerDataSource } from './rename-partial-view.server.data-source.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { UmbRenameRepositoryBase } from '@umbraco-cms/backoffice/entity-action';
+import { UmbRenameServerFileRepositoryBase } from '@umbraco-cms/backoffice/server-file-system';
 
-export class UmbRenamePartialViewRepository extends UmbRenameRepositoryBase<UmbPartialViewDetailModel> {
+export class UmbRenamePartialViewRepository extends UmbRenameServerFileRepositoryBase<UmbPartialViewDetailModel> {
 	constructor(host: UmbControllerHost) {
-		super(host, UmbRenamePartialViewServerDataSource);
+		super(host, UmbRenamePartialViewServerDataSource, UMB_PARTIAL_VIEW_DETAIL_STORE_CONTEXT);
 	}
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/index.ts
index 2ea469c2d1..39402645a6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/index.ts
@@ -1,2 +1,3 @@
 export { UmbPartialViewDetailRepository } from './partial-view-detail.repository.js';
 export { UMB_PARTIAL_VIEW_DETAIL_REPOSITORY_ALIAS } from './manifests.js';
+export { UMB_PARTIAL_VIEW_DETAIL_STORE_CONTEXT } from './partial-view-detail.store.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.repository.ts
index e95a45228a..8617d7c695 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.repository.ts
@@ -2,9 +2,9 @@ import { UMB_SCRIPT_DETAIL_STORE_CONTEXT } from '../../repository/index.js';
 import type { UmbScriptDetailModel } from '../../types.js';
 import { UmbRenameScriptServerDataSource } from './rename-script.server.data-source.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { UmbRenameRepositoryBase } from '@umbraco-cms/backoffice/entity-action';
+import { UmbRenameServerFileRepositoryBase } from '@umbraco-cms/backoffice/server-file-system';
 
-export class UmbRenameScriptRepository extends UmbRenameRepositoryBase<UmbScriptDetailModel> {
+export class UmbRenameScriptRepository extends UmbRenameServerFileRepositoryBase<UmbScriptDetailModel> {
 	constructor(host: UmbControllerHost) {
 		super(host, UmbRenameScriptServerDataSource, UMB_SCRIPT_DETAIL_STORE_CONTEXT);
 	}