diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index 8fe98da53f..173fbb7778 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -22,7 +22,7 @@ import { v4 as uuid } from 'uuid';
 import {
   SerializedTaskEvent,
   SerializedTask,
-  Status,
+  TaskStatus,
   TaskEventType,
   TaskSecrets,
   TaskSpec,
@@ -40,7 +40,7 @@ const migrationsDir = resolvePackagePath(
 export type RawDbTaskRow = {
   id: string;
   spec: string;
-  status: Status;
+  status: TaskStatus;
   last_heartbeat_at?: string;
   created_at: string;
   secrets?: string | null;
@@ -202,7 +202,7 @@ export class DatabaseTaskStore implements TaskStore {
     eventBody,
   }: {
     taskId: string;
-    status: Status;
+    status: TaskStatus;
     eventBody: JsonObject;
   }): Promise<void> {
     let oldStatus: string;
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
index 7e7ebe5436..7f09623cb5 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
@@ -17,7 +17,7 @@ import { JsonObject } from '@backstage/types';
 import { assertError } from '@backstage/errors';
 import { Logger } from 'winston';
 import {
-  CompletedTaskState,
+  TaskCompletionState,
   TaskContext,
   TaskSecrets,
   TaskSpec,
@@ -75,7 +75,7 @@ export class TaskManager implements TaskContext {
   }
 
   async complete(
-    result: CompletedTaskState,
+    result: TaskCompletionState,
     metadata?: JsonObject,
   ): Promise<void> {
     await this.storage.completeTask({
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
index f563a08df6..47507b8c9c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
@@ -21,6 +21,7 @@ export type { CreateWorkerOptions } from './TaskWorker';
 export type {
   TaskSecrets,
   TaskSpec,
+  TaskCompletionState,
   CompletedTaskState,
   TaskStoreEmitOptions,
   TaskStoreListEventsOptions,
@@ -29,6 +30,7 @@ export type {
   TaskSpecV1beta2,
   TaskSpecV1beta3,
   Status,
+  TaskStatus,
   TaskEventType,
   TaskBroker,
   TaskContext,
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
index 8b28fe562c..abb3fe45ef 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
@@ -32,11 +32,11 @@ export type {
 };
 
 /**
- * Status
+ * The status of each step of the Task
  *
  * @public
  */
-export type Status =
+export type TaskStatus =
   | 'open'
   | 'processing'
   | 'failed'
@@ -44,11 +44,27 @@ export type Status =
   | 'completed';
 
 /**
- * CompletedTaskState
+ * The status of each step of the Task
+ *
+ * @public
+ * @deprecated use TaskStatus instead
+ */
+export type Status = TaskStatus;
+
+/**
+ * The state of a completed task.
  *
  * @public
  */
-export type CompletedTaskState = 'failed' | 'completed';
+export type TaskCompletionState = 'failed' | 'completed';
+
+/**
+ * The state of a completed task.
+ *
+ * @public
+ * @deprecated use TaskCompletionState instead
+ */
+export type CompletedTaskState = TaskCompletionState;
 
 /**
  * SerializedTask