diff --git a/src/Umbraco.Web.UI.Client/libs/repository/repository-detail-data-source.interface.ts b/src/Umbraco.Web.UI.Client/libs/repository/repository-detail-data-source.interface.ts
index ff4cdd3a6a..766ddf1e87 100644
--- a/src/Umbraco.Web.UI.Client/libs/repository/repository-detail-data-source.interface.ts
+++ b/src/Umbraco.Web.UI.Client/libs/repository/repository-detail-data-source.interface.ts
@@ -1,9 +1,9 @@
 import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository';
 
-export interface RepositoryDetailDataSource<DetailType> {
-	createScaffold(parentKey: string | null): Promise<DataSourceResponse<DetailType>>;
-	get(key: string): Promise<DataSourceResponse<DetailType>>;
-	insert(data: DetailType): Promise<DataSourceResponse<DetailType>>;
-	update(data: DetailType): Promise<DataSourceResponse<DetailType>>;
-	delete(key: string): Promise<DataSourceResponse<DetailType>>;
+export interface UmbDataSource<T> {
+	createScaffold(parentKey: string | null): Promise<DataSourceResponse<T>>;
+	get(key: string): Promise<DataSourceResponse<T>>;
+	insert(data: T): Promise<DataSourceResponse<T>>;
+	update(data: T): Promise<DataSourceResponse<T>>;
+	delete(key: string): Promise<DataSourceResponse<T>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/sources/document-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/sources/document-type.server.data.ts
index 358910aabc..f5819640ff 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/sources/document-type.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/repository/sources/document-type.server.data.ts
@@ -1,5 +1,9 @@
-import { RepositoryDetailDataSource } from '@umbraco-cms/backoffice/repository';
-import { DocumentTypeResource, ProblemDetailsModel, DocumentTypeResponseModel } from '@umbraco-cms/backoffice/backend-api';
+import { UmbDataSource } from '@umbraco-cms/backoffice/repository';
+import {
+	DocumentTypeResource,
+	ProblemDetailsModel,
+	DocumentTypeResponseModel,
+} from '@umbraco-cms/backoffice/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
 
@@ -9,7 +13,7 @@ import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
  * @class UmbDocumentTypeServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export class UmbDocumentTypeServerDataSource implements RepositoryDetailDataSource<DocumentTypeResponseModel> {
+export class UmbDocumentTypeServerDataSource implements UmbDataSource<DocumentTypeResponseModel> {
 	#host: UmbControllerHostInterface;
 
 	/**
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/document.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/document.server.data.ts
index 467b0fa35f..c68b6a8eb1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/document.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/document.server.data.ts
@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { RepositoryDetailDataSource } from '@umbraco-cms/backoffice/repository';
+import { UmbDataSource } from '@umbraco-cms/backoffice/repository';
 import {
 	DocumentResource,
 	ProblemDetailsModel,
@@ -15,7 +15,7 @@ import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
  * @class UmbDocumentServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export class UmbDocumentServerDataSource implements RepositoryDetailDataSource<DocumentResponseModel> {
+export class UmbDocumentServerDataSource implements UmbDataSource<DocumentResponseModel> {
 	#host: UmbControllerHostInterface;
 
 	/**
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts
index ac6a6497ed..de97e4eed6 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/repository/sources/index.ts
@@ -1,7 +1,7 @@
 import type { DocumentResponseModel } from '@umbraco-cms/backoffice/backend-api';
-import { RepositoryDetailDataSource, DataSourceResponse } from '@umbraco-cms/backoffice/repository';
+import { UmbDataSource, DataSourceResponse } from '@umbraco-cms/backoffice/repository';
 
-export interface UmbDocumentDataSource extends RepositoryDetailDataSource<DocumentResponseModel> {
+export interface UmbDocumentDataSource extends UmbDataSource<DocumentResponseModel> {
 	createScaffold(documentTypeKey: string): Promise<DataSourceResponse<DocumentResponseModel>>;
 	trash(key: string): Promise<DataSourceResponse<DocumentResponseModel>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/sources/media.detail.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/sources/media.detail.server.data.ts
index 57b1fde3c7..120cb495e8 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/sources/media.detail.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/sources/media.detail.server.data.ts
@@ -1,5 +1,5 @@
 import type { MediaDetails } from '../../';
-import { RepositoryDetailDataSource } from '@umbraco-cms/backoffice/repository';
+import { UmbDataSource } from '@umbraco-cms/backoffice/repository';
 import { ProblemDetailsModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
@@ -10,7 +10,7 @@ import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
  * @class UmbTemplateDetailServerDataSource
  * @implements {TemplateDetailDataSource}
  */
-export class UmbMediaDetailServerDataSource implements RepositoryDetailDataSource<MediaDetails> {
+export class UmbMediaDetailServerDataSource implements UmbDataSource<MediaDetails> {
 	#host: UmbControllerHostInterface;
 
 	/**
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/repository/sources/member-group.detail.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/repository/sources/member-group.detail.server.data.ts
index 91d1b54cd7..544de51bc6 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/repository/sources/member-group.detail.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/repository/sources/member-group.detail.server.data.ts
@@ -2,7 +2,7 @@ import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
 import { ProblemDetailsModel } from '@umbraco-cms/backoffice/backend-api';
 import type { MemberGroupDetails } from '@umbraco-cms/backoffice/models';
-import { RepositoryDetailDataSource } from '@umbraco-cms/backoffice/repository';
+import { UmbDataSource } from '@umbraco-cms/backoffice/repository';
 
 /**
  * @description - A data source for the MemberGroup detail that fetches data from the server
@@ -11,7 +11,7 @@ import { RepositoryDetailDataSource } from '@umbraco-cms/backoffice/repository';
  * @implements {MemberGroupDetailDataSource}
  */
 // TODO => Provide type when it is available
-export class UmbMemberGroupDetailServerDataSource implements RepositoryDetailDataSource<any> {
+export class UmbMemberGroupDetailServerDataSource implements UmbDataSource<any> {
 	#host: UmbControllerHostInterface;
 
 	constructor(host: UmbControllerHostInterface) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/sources/data-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/sources/data-type.server.data.ts
index 375237041e..86585ea6f1 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/sources/data-type.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/repository/sources/data-type.server.data.ts
@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { RepositoryDetailDataSource } from '@umbraco-cms/backoffice/repository';
+import { UmbDataSource } from '@umbraco-cms/backoffice/repository';
 import {
 	ProblemDetailsModel,
 	DataTypeResource,
@@ -15,7 +15,7 @@ import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
  * @class UmbDataTypeServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export class UmbDataTypeServerDataSource implements RepositoryDetailDataSource<DataTypeResponseModel> {
+export class UmbDataTypeServerDataSource implements UmbDataSource<DataTypeResponseModel> {
 	#host: UmbControllerHostInterface;
 
 	/**
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts
index 3a2bfbb366..4a3e236af4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/repository/sources/index.ts
@@ -1,5 +1,5 @@
 import { LanguageResponseModel, PagedLanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
-import { RepositoryDetailDataSource, DataSourceResponse } from '@umbraco-cms/backoffice/repository';
+import { UmbDataSource, DataSourceResponse } from '@umbraco-cms/backoffice/repository';
 
 // TODO: This is a temporary solution until we have a proper paging interface
 type paging = {
@@ -7,7 +7,7 @@ type paging = {
 	take: number;
 };
 
-export interface UmbLanguageDataSource extends RepositoryDetailDataSource<LanguageResponseModel> {
+export interface UmbLanguageDataSource extends UmbDataSource<LanguageResponseModel> {
 	createScaffold(): Promise<DataSourceResponse<LanguageResponseModel>>;
 	get(isoCode: string): Promise<DataSourceResponse<LanguageResponseModel>>;
 	delete(isoCode: string): Promise<DataSourceResponse<LanguageResponseModel>>;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/repository/sources/relation-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/repository/sources/relation-type.server.data.ts
index d7756f9ae9..b16a93ebc8 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/repository/sources/relation-type.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/repository/sources/relation-type.server.data.ts
@@ -1,4 +1,4 @@
-import { RepositoryDetailDataSource } from '@umbraco-cms/backoffice/repository';
+import { UmbDataSource } from '@umbraco-cms/backoffice/repository';
 import {
 	ProblemDetailsModel,
 	RelationTypeResource,
@@ -15,7 +15,7 @@ import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
  * @class UmbRelationTypeServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export class UmbRelationTypeServerDataSource implements RepositoryDetailDataSource<RelationTypeResponseModel> {
+export class UmbRelationTypeServerDataSource implements UmbDataSource<RelationTypeResponseModel> {
 	#host: UmbControllerHostInterface;
 
 	/**