diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/Database.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/MemoryDatabase.ts
similarity index 97%
rename from plugins/scaffolder-backend/src/scaffolder/tasks/Database.ts
rename to plugins/scaffolder-backend/src/scaffolder/tasks/MemoryDatabase.ts
index 6f49a1f577..65e64bf2a8 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/Database.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/MemoryDatabase.ts
@@ -25,7 +25,7 @@ export interface Database {
   setStatus(taskId: string, status: Status): Promise<void>;
 }
 
-export class InMemoryDatabase implements Database {
+export class MemoryDatabase implements Database {
   private readonly store = new Map<string, DbTaskRow>();
 
   async heartBeat(runId: string): Promise<void> {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskBroker.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/MemoryTaskBroker.test.ts
similarity index 93%
rename from plugins/scaffolder-backend/src/scaffolder/tasks/TaskBroker.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/tasks/MemoryTaskBroker.test.ts
index 388e2fdec8..f1493ab3d0 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskBroker.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/MemoryTaskBroker.test.ts
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import { InMemoryDatabase } from './Database';
-import { MemoryTaskBroker, TaskAgent } from './TaskBroker';
+import { MemoryDatabase } from './MemoryDatabase';
+import { MemoryTaskBroker, TaskAgent } from './MemoryTaskBroker';
 
 describe('MemoryTaskBroker', () => {
-  const storage = new InMemoryDatabase();
+  const storage = new MemoryDatabase();
   const broker = new MemoryTaskBroker(storage);
 
   it('should claim a dispatched work item', async () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskBroker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/MemoryTaskBroker.ts
similarity index 94%
rename from plugins/scaffolder-backend/src/scaffolder/tasks/TaskBroker.ts
rename to plugins/scaffolder-backend/src/scaffolder/tasks/MemoryTaskBroker.ts
index 6d6fb0a72f..d29aeb9be6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskBroker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/MemoryTaskBroker.ts
@@ -21,12 +21,12 @@ import {
   TaskBroker,
   DispatchResult,
 } from './types';
-import { InMemoryDatabase } from './Database';
+import { MemoryDatabase } from './MemoryDatabase';
 
 export class TaskAgent implements Task {
   private heartbeartInterval?: ReturnType<typeof setInterval>;
 
-  static create(state: TaskState, storage: InMemoryDatabase) {
+  static create(state: TaskState, storage: MemoryDatabase) {
     const agent = new TaskAgent(state, storage);
     agent.start();
     return agent;
@@ -35,7 +35,7 @@ export class TaskAgent implements Task {
   // Runs heartbeat internally
   private constructor(
     private readonly state: TaskState,
-    private readonly storage: InMemoryDatabase,
+    private readonly storage: MemoryDatabase,
   ) {}
 
   get spec() {