diff --git a/libs/tools/generator/extensions/src/index.ts b/libs/tools/generator/extensions/src/index.ts
index d266519192..53f7232644 100644
--- a/libs/tools/generator/extensions/src/index.ts
+++ b/libs/tools/generator/extensions/src/index.ts
@@ -2,3 +2,8 @@ export * as history from "./history";
 export * as legacyPassword from "./legacy-password";
 export * as legacyUsername from "./legacy-username";
 export * as navigation from "./navigation";
+
+export { GeneratorHistoryService } from "./history";
+export { GeneratorNavigationService } from "./navigation";
+export { PasswordGenerationServiceAbstraction } from "./legacy-password";
+export { UsernameGenerationServiceAbstraction } from "./legacy-username";
diff --git a/libs/tools/generator/extensions/src/legacy-password/factory.ts b/libs/tools/generator/extensions/src/legacy-password/create-generation-service.ts
similarity index 100%
rename from libs/tools/generator/extensions/src/legacy-password/factory.ts
rename to libs/tools/generator/extensions/src/legacy-password/create-generation-service.ts
diff --git a/libs/tools/generator/extensions/src/legacy-username/factory.ts b/libs/tools/generator/extensions/src/legacy-username/create-generation-service.ts
similarity index 100%
rename from libs/tools/generator/extensions/src/legacy-username/factory.ts
rename to libs/tools/generator/extensions/src/legacy-username/create-generation-service.ts