diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/entity-is-trashed.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/entity-is-trashed.context-token.ts
new file mode 100644
index 0000000000..be593a1038
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/entity-is-trashed.context-token.ts
@@ -0,0 +1,6 @@
+import type { UmbEntityIsTrashedContext } from './entity-is-trashed.context.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+
+export const UMB_ENTITY_IS_TRASHED_CONTEXT = new UmbContextToken<UmbEntityIsTrashedContext>(
+	'UmbEntityIsTrashedContext',
+);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/is-trashed.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/entity-is-trashed.context.ts
similarity index 70%
rename from src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/is-trashed.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/entity-is-trashed.context.ts
index 9bbd5a038b..740c62cdc2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/is-trashed.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/entity-is-trashed.context.ts
@@ -1,4 +1,4 @@
-import { UMB_IS_TRASHED_CONTEXT } from './is-trashed.context-token.js';
+import { UMB_ENTITY_IS_TRASHED_CONTEXT } from './entity-is-trashed.context-token.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
@@ -7,15 +7,15 @@ import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
  * Represents the context for the isTrashed state
  * @export
  * @class UmbIsTrashedContext
- * @extends {UmbContextBase<UmbIsTrashedContext>}
- * @implements {UmbIsTrashedContext}
+ * @extends {UmbContextBase<UmbEntityIsTrashedContext>}
+ * @implements {UmbEntityIsTrashedContext}
  */
-export class UmbIsTrashedContext extends UmbContextBase<UmbIsTrashedContext> {
+export class UmbEntityIsTrashedContext extends UmbContextBase<UmbEntityIsTrashedContext> {
 	#isTrashed = new UmbBooleanState(false);
 	isTrashed = this.#isTrashed.asObservable();
 
 	constructor(host: UmbControllerHost) {
-		super(host, UMB_IS_TRASHED_CONTEXT);
+		super(host, UMB_ENTITY_IS_TRASHED_CONTEXT);
 	}
 
 	/**
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/index.ts
index c5d31906ee..131804df9c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/index.ts
@@ -1,3 +1,3 @@
-export { UmbIsTrashedContext } from './is-trashed.context.js';
-export { UMB_IS_TRASHED_CONTEXT } from './is-trashed.context-token.js';
+export { UmbEntityIsTrashedContext as UmbIsTrashedContext } from './entity-is-trashed.context.js';
+export { UMB_ENTITY_IS_TRASHED_CONTEXT as UMB_IS_TRASHED_CONTEXT } from './entity-is-trashed.context-token.js';
 export type { IUmbIsTrashedContext } from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/is-trashed.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/is-trashed.context-token.ts
deleted file mode 100644
index e15ff7b6d3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/contexts/is-trashed/is-trashed.context-token.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type { UmbIsTrashedContext } from './is-trashed.context.js';
-import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-
-export const UMB_IS_TRASHED_CONTEXT = new UmbContextToken<UmbIsTrashedContext>('UmbIsTrashedContext');