diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-controller.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-controller.ts
index 2eafa4c359..5f2332fa5c 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-controller.ts
@@ -1,7 +1,7 @@
 import { createExtensionApi } from '../functions/create-extension-api.function.js';
 import { UmbExtensionRegistry } from '../registry/extension.registry.js';
 import { isManifestApiType } from '../type-guards/is-manifest-apiable-type.function.js';
-import { ExtensionApi, ManifestApi, ManifestCondition, ManifestWithDynamicConditions } from '../types.js';
+import { UmbApi, ManifestApi, ManifestCondition, ManifestWithDynamicConditions } from '../types.js';
 import { UmbBaseExtensionController } from './base-extension-controller.js';
 import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
@@ -20,7 +20,7 @@ import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 export class UmbExtensionApiController<
 	ManifestType extends ManifestApi =  ManifestApi,
 	ControllerType extends UmbExtensionApiController<ManifestType, any> = any,
-	ExtensionApiInterface extends ExtensionApi = ManifestType extends ManifestApi ? NonNullable<ManifestType['API_TYPE']> : ExtensionApi
+	ExtensionApiInterface extends UmbApi = ManifestType extends ManifestApi ? NonNullable<ManifestType['API_TYPE']> : UmbApi
 > extends UmbBaseExtensionController<ManifestType, ControllerType> {
 
 	#api?: ExtensionApiInterface;
diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.function.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.function.ts
index 87ef18f45f..0430f7fc84 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.function.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.function.ts
@@ -1,9 +1,9 @@
 import { hasApiExport, hasDefaultExport, isManifestApiConstructorType } from '../type-guards/index.js';
-import type { ManifestApi, ClassConstructor, ManifestElementAndApi, ExtensionApi } from '../types.js';
+import type { ManifestApi, ClassConstructor, ManifestElementAndApi, UmbApi } from '../types.js';
 import { loadExtensionApi } from '../functions/load-extension-api.function.js';
 
 //TODO: Write tests for this method:
-export async function createExtensionApi<ApiType extends ExtensionApi = ExtensionApi>(
+export async function createExtensionApi<ApiType extends UmbApi = UmbApi>(
 	manifest: ManifestApi<ApiType> | ManifestElementAndApi<any, ApiType>,
 	constructorArguments: unknown[] = []
 ): Promise<ApiType | undefined> {
diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.test.ts
index 04ff9a2147..f04db5c957 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.test.ts
@@ -1,18 +1,18 @@
 import { expect } from '@open-wc/testing';
-import { ManifestApi, ExtensionApi } from '../types.js';
+import { ManifestApi, UmbApi } from '../types.js';
 import { createExtensionApi } from './create-extension-api.function.js';
 
 
 
 
-class UmbExtensionApiTrueTestClass implements ExtensionApi {
+class UmbExtensionApiTrueTestClass implements UmbApi {
 	isValidClassInstance() {
 		return true;
 	}
 	destroy() {}
 }
 
-class UmbExtensionApiFalseTestClass implements ExtensionApi {
+class UmbExtensionApiFalseTestClass implements UmbApi {
 	isValidClassInstance() {
 		return false;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/is-manifest-api-instance-type.function.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/is-manifest-api-instance-type.function.ts
index 3f7bc7de5f..dbaa792374 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/is-manifest-api-instance-type.function.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/is-manifest-api-instance-type.function.ts
@@ -1,9 +1,9 @@
-import type { ClassConstructor, ExtensionApi, ManifestApi } from '../types.js';
+import type { ClassConstructor, UmbApi, ManifestApi } from '../types.js';
 
-export function isManifestApiConstructorType<ApiType extends ExtensionApi>(manifest: unknown): manifest is ManifestApiWithClassConstructor<ApiType> {
+export function isManifestApiConstructorType<ApiType extends UmbApi>(manifest: unknown): manifest is ManifestApiWithClassConstructor<ApiType> {
 	return typeof manifest === 'object' && manifest !== null && (manifest as ManifestApi).api !== undefined;
 }
 
-export interface ManifestApiWithClassConstructor<T extends ExtensionApi = ExtensionApi> extends ManifestApi<T> {
+export interface ManifestApiWithClassConstructor<T extends UmbApi = UmbApi> extends ManifestApi<T> {
 	api: ClassConstructor<T>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types.ts
index 912172f465..c073a422db 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types.ts
@@ -98,14 +98,14 @@ export interface ManifestWithLoader<LoaderReturnType> extends ManifestBase {
 }
 
 // TODO: Rename this to something more descriptive:
-export interface ExtensionApi {
+export interface UmbApi {
 	destroy?(): void;
 }
 
 /**
  * The type of extension such as dashboard etc...
  */
-export interface ManifestApi<ApiType extends ExtensionApi = ExtensionApi>
+export interface ManifestApi<ApiType extends UmbApi = UmbApi>
 	extends ManifestWithLoader<{ default: ClassConstructor<ApiType> } | { api: ClassConstructor<ApiType> }> {
 	/**
 	 * @TJS-ignore
@@ -137,7 +137,7 @@ export interface ManifestWithLoaderIncludingDefaultExport<T = unknown>
 	js?: string;
 }
 
-export interface ManifestWithLoaderIncludingApiExport<ApiType extends ExtensionApi = ExtensionApi>
+export interface ManifestWithLoaderIncludingApiExport<ApiType extends UmbApi = UmbApi>
 	extends ManifestWithLoader<{ api: ApiType } | Omit<object, 'api'>> {
 	/**
 	 * The file location of the javascript file to load
@@ -162,7 +162,7 @@ export interface ManifestWithLoaderIncludingElementExport<ElementType extends HT
 }
 export interface ManifestWithLoaderOptionalApiOrElementExport<
 	ElementType extends HTMLElement = HTMLElement,
-	ApiType extends ExtensionApi = ExtensionApi,
+	ApiType extends UmbApi = UmbApi,
 	ClassType = { element: ElementType } | { api: ApiType } | { element: ElementType, api: ApiType } | Omit<Omit<object, 'element'>, 'api'>
 >
 extends ManifestWithLoader<ClassType> {
@@ -206,7 +206,7 @@ export interface ManifestElement<ElementType extends HTMLElement = HTMLElement>
 	meta?: unknown;
 }
 
-export interface ManifestElementAndApi<ElementType extends HTMLElement = HTMLElement, ApiType extends ExtensionApi = ExtensionApi>
+export interface ManifestElementAndApi<ElementType extends HTMLElement = HTMLElement, ApiType extends UmbApi = UmbApi>
 	extends ManifestWithLoaderOptionalApiOrElementExport<ElementType, ApiType> {
 	/**
 	 * @TJS-ignore
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/action/action.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/action/action.interface.ts
index 43433f9a04..06c5c958d7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/action/action.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/action/action.interface.ts
@@ -1,6 +1,6 @@
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export interface UmbAction<RepositoryType = unknown> extends ExtensionApi {
+export interface UmbAction<RepositoryType = unknown> extends UmbApi {
 	repository?: RepositoryType;
 	execute(): Promise<void>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/action/repository-action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/action/repository-action.ts
index 881cb06615..b3641a0194 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/action/repository-action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/action/repository-action.ts
@@ -1,8 +1,8 @@
 import { UmbBaseController, UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
-import { type ExtensionApi, UmbExtensionApiController } from '@umbraco-cms/backoffice/extension-api';
+import { type UmbApi, UmbExtensionApiController } from '@umbraco-cms/backoffice/extension-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 
-export class UmbActionBase<RepositoryType> extends UmbBaseController implements ExtensionApi {
+export class UmbActionBase<RepositoryType> extends UmbBaseController implements UmbApi {
 	repository?: RepositoryType;
 
 	constructor(host: UmbControllerHostElement, repositoryAlias: string) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/tiny-mce-plugin.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/tiny-mce-plugin.ts
index 3d67330a50..354c4608a6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/tiny-mce-plugin.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/tiny-mce-plugin.ts
@@ -1,10 +1,10 @@
 import type { UmbInputTinyMceElement } from '@umbraco-cms/backoffice/components';
 import { UmbBaseController } from '@umbraco-cms/backoffice/controller-api';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 import type { Editor } from '@umbraco-cms/backoffice/external/tinymce';
 import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 
-export class UmbTinyMcePluginBase extends UmbBaseController implements ExtensionApi {
+export class UmbTinyMcePluginBase extends UmbBaseController implements UmbApi {
 	editor: Editor;
 	configuration?: UmbPropertyEditorConfigCollection;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/culture.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/culture.repository.ts
index e839e91c6f..e26f96fc43 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/culture.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/culture.repository.ts
@@ -1,8 +1,8 @@
 import { UmbCultureServerDataSource } from './sources/culture.server.data.js';
 import { UmbBaseController, type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { type ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { type UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export class UmbCultureRepository extends UmbBaseController implements ExtensionApi {
+export class UmbCultureRepository extends UmbBaseController implements UmbApi {
 	
 	#dataSource: UmbCultureServerDataSource;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts
index 16b7471a18..33a5c5b32e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts
@@ -1,6 +1,6 @@
 import type { ConditionTypes } from '../conditions/types.js';
-import type { ExtensionApi, ManifestApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
+import type { UmbApi, ManifestApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
 // TODO: Consider adding a ClassType for this manifest. (Currently we cannot know the scope of a repository, therefor we are going with ExtensionApi for now.)
-export interface ManifestRepository<ApiType extends ExtensionApi = ExtensionApi> extends ManifestApi<ApiType>, ManifestWithDynamicConditions<ConditionTypes> {
+export interface ManifestRepository<ApiType extends UmbApi = UmbApi> extends ManifestApi<ApiType>, ManifestWithDynamicConditions<ConditionTypes> {
 	type: 'repository';
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/folder-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/folder-repository.interface.ts
index d0eb4498ef..ddf9268ddc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/folder-repository.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/folder-repository.interface.ts
@@ -5,9 +5,9 @@ import type {
 	ProblemDetails,
 	UpdateFolderResponseModel,
 } from '@umbraco-cms/backoffice/backend-api';
-import type { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export interface UmbFolderRepository extends ExtensionApi {
+export interface UmbFolderRepository extends UmbApi {
 	createFolderScaffold(parentId: string | null): Promise<{
 		data?: FolderResponseModel;
 		error?: ProblemDetails;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/item-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/item-repository.interface.ts
index 9377f48dde..344fc7bc14 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/item-repository.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/item-repository.interface.ts
@@ -1,8 +1,8 @@
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import { ItemResponseModelBaseModel, ProblemDetails } from '@umbraco-cms/backoffice/backend-api';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export interface UmbItemRepository<ItemType extends ItemResponseModelBaseModel> extends ExtensionApi {
+export interface UmbItemRepository<ItemType extends ItemResponseModelBaseModel> extends UmbApi {
 	requestItems: (uniques: string[]) => Promise<{
 		data?: Array<ItemType> | undefined;
 		error?: ProblemDetails | undefined;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/tree-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/tree-repository.interface.ts
index f08356fe3e..46f52b5f06 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/tree-repository.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/tree-repository.interface.ts
@@ -2,12 +2,12 @@ import { type UmbPagedData } from './data-source/types.js';
 import { type Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import type { UmbTreeRootEntityModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree';
 import { ProblemDetails, EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export interface UmbTreeRepository<
 	TreeItemType extends EntityTreeItemResponseModel,
 	TreeRootType extends UmbTreeRootModel = UmbTreeRootEntityModel
-> extends ExtensionApi {
+> extends UmbApi {
 	requestTreeRoot: () => Promise<{
 		data?: TreeRootType;
 		error?: ProblemDetails;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts
index 7831278c7d..c349c44821 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/item-store.interface.ts
@@ -1,8 +1,8 @@
 import { UmbStore } from './store.interface.js';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import { ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
-import type { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export interface UmbItemStore<T extends ItemResponseModelBaseModel = any> extends UmbStore<T>, ExtensionApi {
+export interface UmbItemStore<T extends ItemResponseModelBaseModel = any> extends UmbStore<T>, UmbApi {
 	items: (uniques: Array<string>) => Observable<Array<T>>;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/store-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/store-base.ts
index ad40c6cb80..1f7dd1c918 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/store-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/store-base.ts
@@ -1,11 +1,11 @@
 import { UmbStore } from './store.interface.js';
 import { UmbContextProviderController } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { type ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { type UmbApi } from '@umbraco-cms/backoffice/extension-api';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
 
 // TODO: Make a Store interface?
-export class UmbStoreBase<StoreItemType = any> implements UmbStore<StoreItemType>, ExtensionApi {
+export class UmbStoreBase<StoreItemType = any> implements UmbStore<StoreItemType>, UmbApi {
 
 	#provider;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/tree-store.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/tree-store.interface.ts
index dfe491c027..2755980924 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/store/tree-store.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/tree-store.interface.ts
@@ -1,9 +1,9 @@
 import { UmbStore } from './store.interface.js';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api';
-import type { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export interface UmbTreeStore<T extends TreeItemPresentationModel = any> extends UmbStore<T>, ExtensionApi {
+export interface UmbTreeStore<T extends TreeItemPresentationModel = any> extends UmbStore<T>, UmbApi {
 	rootItems: Observable<Array<T>>;
 	childrenOf: (parentUnique: string | null) => Observable<Array<T>>;
 	// TODO: remove this one when all repositories are using an item store
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts
index 8e36db167c..58d7bf467a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action-base.ts
@@ -1,9 +1,9 @@
 import { UmbWorkspaceContextInterface, UMB_WORKSPACE_CONTEXT } from '../workspace-context/index.js';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
-import type { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export interface UmbWorkspaceAction<WorkspaceType = unknown> extends ExtensionApi {
+export interface UmbWorkspaceAction<WorkspaceType = unknown> extends UmbApi {
 	host: UmbControllerHostElement;
 	workspaceContext?: WorkspaceType;
 	execute(): Promise<void>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts
index 2daf2c3b55..66ecced7f3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts
@@ -12,7 +12,7 @@ import {
 	UpdateDictionaryItemRequestModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
-import type { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export class UmbDictionaryRepository extends UmbBaseController
 	implements
@@ -23,7 +23,7 @@ export class UmbDictionaryRepository extends UmbBaseController
 			UpdateDictionaryItemRequestModel,
 			DictionaryOverviewResponseModel
 		>,
-		ExtensionApi
+		UmbApi
 {
 	#init!: Promise<unknown>;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.repository.ts
index 1135e6c3cf..cc19105e92 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/document-type.repository.ts
@@ -15,7 +15,7 @@ import {
 	UpdateDocumentTypeRequestModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 type ItemType = DocumentTypeResponseModel;
 
@@ -23,7 +23,7 @@ export class UmbDocumentTypeRepository extends UmbBaseController
 	implements
 		UmbTreeRepository<EntityTreeItemResponseModel>,
 		UmbDetailRepository<CreateDocumentTypeRequestModel, any, UpdateDocumentTypeRequestModel, DocumentTypeResponseModel>,
-		ExtensionApi
+		UmbApi
 {
 	#init!: Promise<unknown>;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
index 1591a7c44d..93ed673c97 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
@@ -13,13 +13,13 @@ import {
 	DocumentTreeItemResponseModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export class UmbDocumentRepository extends UmbBaseController
 	implements
 		UmbTreeRepository<DocumentTreeItemResponseModel>,
 		UmbDetailRepository<CreateDocumentRequestModel, any, UpdateDocumentRequestModel, DocumentResponseModel>,
-		ExtensionApi
+		UmbApi
 {
 	#init!: Promise<unknown>;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/media-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/media-type.repository.ts
index c7f62b1045..0bd3481691 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/media-type.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/media-type.repository.ts
@@ -21,14 +21,14 @@ import {
 	MediaTypeResponseModel,
 	UpdateMediaTypeRequestModel,
 } from '@umbraco-cms/backoffice/backend-api';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export class UmbMediaTypeRepository extends UmbBaseController
 	implements
 		UmbItemRepository<MediaTypeItemResponseModel>,
 		UmbTreeRepository<FolderTreeItemResponseModel>,
 		UmbDetailRepository<CreateMediaTypeRequestModel, any, UpdateMediaTypeRequestModel, MediaTypeResponseModel>,
-		ExtensionApi
+		UmbApi
 {
 	#init!: Promise<unknown>;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/media.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/media.repository.ts
index c48bce1f63..714da6a421 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/media.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/media.repository.ts
@@ -14,13 +14,13 @@ import {
 } from '@umbraco-cms/backoffice/backend-api';
 import { UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export class UmbMediaRepository extends UmbBaseController
 	implements
 		UmbTreeRepository<EntityTreeItemResponseModel>,
 		UmbDetailRepository<CreateMediaRequestModel, any, UpdateMediaRequestModel, MediaDetails>,
-		ExtensionApi
+		UmbApi
 {
 	#init;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/member-group.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/member-group.repository.ts
index 35bceda5da..d1c12dc190 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/member-group.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/repository/member-group.repository.ts
@@ -7,11 +7,11 @@ import { UmbBaseController, type UmbControllerHost } from '@umbraco-cms/backoffi
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
 import type { UmbTreeDataSource, UmbDetailRepository, UmbTreeRepository } from '@umbraco-cms/backoffice/repository';
 import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 // TODO => Update type when backend updated
 export class UmbMemberGroupRepository extends UmbBaseController
-	implements UmbTreeRepository<EntityTreeItemResponseModel>, UmbDetailRepository<any, any, any, any>, ExtensionApi
+	implements UmbTreeRepository<EntityTreeItemResponseModel>, UmbDetailRepository<any, any, any, any>, UmbApi
 {
 	#init!: Promise<unknown>;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/repository/member.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/repository/member.repository.ts
index 1bb424fdfc..f807fa0d5b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/members/repository/member.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/repository/member.repository.ts
@@ -2,9 +2,9 @@ import { UmbMemberTreeStore, UMB_MEMBER_TREE_STORE_CONTEXT_TOKEN } from './membe
 import { UmbMemberTreeServerDataSource } from './sources/member.tree.server.data.js';
 import { UmbBaseController, type UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbTreeRepository } from '@umbraco-cms/backoffice/repository';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export class UmbMemberRepository extends UmbBaseController implements UmbTreeRepository<any>, ExtensionApi {
+export class UmbMemberRepository extends UmbBaseController implements UmbTreeRepository<any>, UmbApi {
 	#dataSource: UmbMemberTreeServerDataSource;
 	#treeStore?: UmbMemberTreeStore;
 	#init;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts
index 5a1eb36bbe..3b01a01e15 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts
@@ -1,7 +1,7 @@
 import { UmbPackageStore, UMB_PACKAGE_STORE_TOKEN } from './package.store.js';
 import { UmbPackageServerDataSource } from './sources/package.server.data.js';
 import { UmbBaseController, type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { ExtensionApi, isManifestJSType, ManifestBase } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi, isManifestJSType, ManifestBase } from '@umbraco-cms/backoffice/extension-api';
 import { OpenAPI } from '@umbraco-cms/backoffice/backend-api';
 
 // TODO: Figure out if we should base stores like this on something more generic for "collections" rather than trees.
@@ -10,7 +10,7 @@ import { OpenAPI } from '@umbraco-cms/backoffice/backend-api';
  * A repository for Packages which mimicks a tree store.
  * @export
  */
-export class UmbPackageRepository extends UmbBaseController implements ExtensionApi {
+export class UmbPackageRepository extends UmbBaseController implements UmbApi {
 	#init!: Promise<void>;
 	#packageStore?: UmbPackageStore;
 	#packageSource: UmbPackageServerDataSource;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type.repository.ts
index 55ff12d449..1c029417fa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type.repository.ts
@@ -33,7 +33,7 @@ import {
 	UpdateDataTypeRequestModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 export class UmbDataTypeRepository extends UmbBaseController
 	implements
 		UmbItemRepository<DataTypeItemResponseModel>,
@@ -42,7 +42,7 @@ export class UmbDataTypeRepository extends UmbBaseController
 		UmbFolderRepository,
 		UmbMoveRepository,
 		UmbCopyRepository,
-		ExtensionApi
+		UmbApi
 {
 	#init: Promise<unknown>;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/app-language-select/app-language.context.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/app-language-select/app-language.context.ts
index 160dd8d905..25cf932076 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/app-language-select/app-language.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/app-language-select/app-language.context.ts
@@ -3,9 +3,9 @@ import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
 import { UmbBaseController, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export class UmbAppLanguageContext extends UmbBaseController implements ExtensionApi {
+export class UmbAppLanguageContext extends UmbBaseController implements UmbApi {
 	#languageRepository: UmbLanguageRepository;
 
 	#languages: Array<LanguageResponseModel> = [];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/repository/relation-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/repository/relation-type.repository.ts
index 0960a67d61..7ae1642427 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/repository/relation-type.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/repository/relation-type.repository.ts
@@ -11,13 +11,13 @@ import {
 } from '@umbraco-cms/backoffice/backend-api';
 import { UmbDetailRepository, UmbTreeRepository } from '@umbraco-cms/backoffice/repository';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export class UmbRelationTypeRepository extends UmbBaseController
 	implements
 		UmbTreeRepository<any>,
 		UmbDetailRepository<CreateRelationTypeRequestModel, any, UpdateRelationTypeRequestModel, RelationTypeResponseModel>,
-		ExtensionApi
+		UmbApi
 {
 	#init!: Promise<unknown>;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.repository.ts
index 24288519dd..3ece7b958d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.repository.ts
@@ -1,9 +1,9 @@
 import { UmbTagServerDataSource } from './sources/tag.server.data.js';
 import { UmbTagStore, UMB_TAG_STORE_CONTEXT_TOKEN } from './tag.store.js';
 import { UmbBaseController, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
-export class UmbTagRepository extends UmbBaseController implements ExtensionApi {
+export class UmbTagRepository extends UmbBaseController implements UmbApi {
 	#init!: Promise<unknown>;
 
 	#dataSource: UmbTagServerDataSource;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-views.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-views.repository.ts
index 0612903224..50486ef4ae 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-views.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-views.repository.ts
@@ -28,7 +28,7 @@ import {
 	UmbFolderRepository,
 	UmbTreeRepository,
 } from '@umbraco-cms/backoffice/repository';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export class UmbPartialViewsRepository extends UmbBaseController
 	implements
@@ -41,7 +41,7 @@ export class UmbPartialViewsRepository extends UmbBaseController
 			string
 		>,
 		UmbFolderRepository,
-		ExtensionApi
+		UmbApi
 {
 	#init;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/scripts.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/scripts.repository.ts
index 8c3ee69ea5..4648ae06e4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/scripts.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/scripts.repository.ts
@@ -24,14 +24,14 @@ import {
 } from '@umbraco-cms/backoffice/backend-api';
 import { UmbBaseController, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { Observable } from '@umbraco-cms/backoffice/external/rxjs';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export class UmbScriptsRepository extends UmbBaseController
 	implements
 		UmbTreeRepository<FileSystemTreeItemPresentationModel>,
 		UmbDetailRepository<CreateScriptRequestModel, string, UpdateScriptRequestModel, ScriptResponseModel, string>,
 		UmbFolderRepository,
-		ExtensionApi
+		UmbApi
 {
 	#init;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet.repository.ts
index 6fcba7da39..a0c62959b3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet.repository.ts
@@ -34,14 +34,14 @@ import {
 	UpdateTextFileViewModelBaseModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbTreeRootFileSystemModel } from '@umbraco-cms/backoffice/tree';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export class UmbStylesheetRepository extends UmbBaseController
 	implements
 		UmbTreeRepository<FileSystemTreeItemPresentationModel, UmbTreeRootFileSystemModel>,
 		UmbDetailRepository<CreateStylesheetRequestModel, string, UpdateStylesheetRequestModel, StylesheetDetails>,
 		UmbFolderRepository,
-		ExtensionApi
+		UmbApi
 {
 	#dataSource;
 	#treeDataSource;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.repository.ts
index 0ed5b116f7..74ccde7cea 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/template.repository.ts
@@ -24,14 +24,14 @@ import type {
 	TemplateResponseModel,
 	UpdateTemplateRequestModel,
 } from '@umbraco-cms/backoffice/backend-api';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 export class UmbTemplateRepository extends UmbBaseController
 	implements
 		UmbTreeRepository<EntityTreeItemResponseModel>,
 		UmbDetailRepository<CreateTemplateRequestModel, string, UpdateTemplateRequestModel, TemplateResponseModel>,
 		UmbItemRepository<TemplateItemResponseModel>,
-		ExtensionApi
+		UmbApi
 {
 	#init;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts
index c9d23ca0db..27e7886dc3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/user-group.repository.ts
@@ -19,14 +19,14 @@ import {
 } from '@umbraco-cms/backoffice/repository';
 import { UMB_NOTIFICATION_CONTEXT_TOKEN, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
 import { UmbBaseController, type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { ExtensionApi } from '@umbraco-cms/backoffice/extension-api';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 // TODO: implement
 export class UmbUserGroupRepository extends UmbBaseController
 	implements
 		UmbDetailRepository<CreateUserGroupRequestModel, any, UpdateUserGroupRequestModel, UserGroupResponseModel>,
 		UmbItemRepository<UserGroupItemResponseModel>,
-		ExtensionApi
+		UmbApi
 {
 	#init;