diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
index c14dfe78084..02e5da7590b 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
@@ -249,7 +249,7 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
       }),
     );
     this.generatorService
-      .generator$({ on$: this.onGenerate$, account$ })
+      .generate$({ on$: this.onGenerate$, account$ })
       .pipe(takeUntil(this.destroy$))
       .subscribe((generated) => {
         this.exportForm.patchValue({
diff --git a/libs/tools/generator/components/src/credential-generator.component.ts b/libs/tools/generator/components/src/credential-generator.component.ts
index c9bce3086ca..18608ef67ce 100644
--- a/libs/tools/generator/components/src/credential-generator.component.ts
+++ b/libs/tools/generator/components/src/credential-generator.component.ts
@@ -233,7 +233,7 @@ export class CredentialGeneratorComponent implements OnInit, OnChanges, OnDestro
 
     // wire up the generator
     this.generatorService
-      .generator$({
+      .generate$({
         on$: this.generate$.pipe(
           tap((g) => this.log.debug(g, "generate request issued by component")),
         ),
diff --git a/libs/tools/generator/components/src/password-generator.component.ts b/libs/tools/generator/components/src/password-generator.component.ts
index 4a1a6a90237..adce3e6febb 100644
--- a/libs/tools/generator/components/src/password-generator.component.ts
+++ b/libs/tools/generator/components/src/password-generator.component.ts
@@ -182,7 +182,7 @@ export class PasswordGeneratorComponent implements OnInit, OnChanges, OnDestroy
 
     // wire up the generator
     this.generatorService
-      .generator$({ on$: this.generate$, account$: this.account$ })
+      .generate$({ on$: this.generate$, account$: this.account$ })
       .pipe(
         catchError((error: unknown, generator) => {
           if (typeof error === "string") {
diff --git a/libs/tools/generator/components/src/username-generator.component.ts b/libs/tools/generator/components/src/username-generator.component.ts
index 2001fc13e95..bb5b710b01e 100644
--- a/libs/tools/generator/components/src/username-generator.component.ts
+++ b/libs/tools/generator/components/src/username-generator.component.ts
@@ -207,7 +207,7 @@ export class UsernameGeneratorComponent implements OnInit, OnChanges, OnDestroy
 
     // wire up the generator
     this.generatorService
-      .generator$({
+      .generate$({
         on$: this.generate$,
         account$: this.account$,
       })
diff --git a/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts b/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts
index bcfe3c35f40..74f78514594 100644
--- a/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts
+++ b/libs/tools/generator/core/src/abstractions/credential-generator-service.abstraction.ts
@@ -26,7 +26,7 @@ export abstract class CredentialGeneratorService {
   /** Generates a stream of credentials
    * @param dependencies.on$ Required. A new credential is emitted when this emits.
    */
-  abstract generator$: (
+  abstract generate$: (
     dependencies: OnDependency<GenerateRequest> & BoundDependency<"account", Account>,
   ) => Observable<GeneratedCredential>;
 
diff --git a/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts b/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts
index 847d4d80c45..1b7831c910c 100644
--- a/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts
+++ b/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts
@@ -112,7 +112,7 @@ describe("DefaultCredentialGeneratorService", () => {
         account$: of(account),
       };
 
-      const result = await firstValueFrom(service.generator$(dependencies));
+      const result = await firstValueFrom(service.generate$(dependencies));
 
       expect(result).toBe("generatedPassword");
       expect(providers.metadata!.metadata).toHaveBeenCalledWith("testAlgorithm");
@@ -141,7 +141,7 @@ describe("DefaultCredentialGeneratorService", () => {
         account$: of(account),
       };
 
-      const result = await firstValueFrom(service.generator$(dependencies));
+      const result = await firstValueFrom(service.generate$(dependencies));
 
       expect(result).toBe("generatedPassword");
       expect(providers.metadata!.metadata).toHaveBeenCalledWith("testAlgorithm");
diff --git a/libs/tools/generator/core/src/services/default-credential-generator.service.ts b/libs/tools/generator/core/src/services/default-credential-generator.service.ts
index 5080a0dd4e6..727a04212d3 100644
--- a/libs/tools/generator/core/src/services/default-credential-generator.service.ts
+++ b/libs/tools/generator/core/src/services/default-credential-generator.service.ts
@@ -47,7 +47,7 @@ export class DefaultCredentialGeneratorService implements CredentialGeneratorSer
 
   private readonly log: SemanticLogger;
 
-  generator$(dependencies: OnDependency<GenerateRequest> & BoundDependency<"account", Account>) {
+  generate$(dependencies: OnDependency<GenerateRequest> & BoundDependency<"account", Account>) {
     // `on$` is partitioned into several streams so that the generator
     // engine and settings refresh only when their respective inputs change
     const on$ = dependencies.on$.pipe(shareReplay({ refCount: true, bufferSize: 1 }));
diff --git a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts
index 6bfa6ae06c6..30775aa8a83 100644
--- a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts
+++ b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.ts
@@ -127,7 +127,7 @@ export class SendOptionsComponent implements OnInit {
       pin({ name: () => "send-options.component", distinct: (p, c) => p.id === c.id }),
     );
     const generatedCredential = await firstValueFrom(
-      this.generatorService.generator$({ on$, account$ }),
+      this.generatorService.generate$({ on$, account$ }),
     );
 
     this.sendOptionsForm.patchValue({