From 35d736be0e5d09ff884145bb22f6f05f5bc2c106 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 7 Feb 2023 13:15:52 +0100
Subject: [PATCH] chore: renaming to ServiceFactory

Signed-off-by: blam <ben@blam.sh>
---
 .../cache/{cacheFactory.ts => cacheServiceFactory.ts}       | 2 +-
 .../src/services/implementations/cache/index.ts             | 2 +-
 .../config/{configFactory.ts => configServiceFactory.ts}    | 2 +-
 .../src/services/implementations/config/index.ts            | 4 ++--
 .../{databaseFactory.ts => databaseServiceFactory.ts}       | 2 +-
 .../src/services/implementations/database/index.ts          | 2 +-
 .../{discoveryFactory.ts => discoveryServiceFactory.ts}     | 2 +-
 .../src/services/implementations/discovery/index.ts         | 2 +-
 ...uterFactory.test.ts => httpRouterServiceFactory.test.ts} | 6 +++---
 .../{httpRouterFactory.ts => httpRouterServiceFactory.ts}   | 2 +-
 .../src/services/implementations/httpRouter/index.ts        | 4 ++--
 .../{identityFactory.ts => identityServiceFactory.ts}       | 2 +-
 .../src/services/implementations/identity/index.ts          | 4 ++--
 .../src/services/implementations/lifecycle/index.ts         | 2 +-
 .../{lifecycleFactory.ts => lifecycleServiceFactory.ts}     | 2 +-
 .../src/services/implementations/logger/index.ts            | 2 +-
 .../logger/{loggerFactory.ts => loggerServiceFactory.ts}    | 2 +-
 .../src/services/implementations/permissions/index.ts       | 2 +-
 .../{permissionsFactory.ts => permissionsServiceFactory.ts} | 2 +-
 .../src/services/implementations/rootHttpRouter/index.ts    | 4 ++--
 ...HttpRouterFactory.ts => rootHttpRouterServiceFactory.ts} | 2 +-
 .../src/services/implementations/rootLifecycle/index.ts     | 2 +-
 ...eFactory.test.ts => rootLifecycleServiceFactory.test.ts} | 2 +-
 ...otLifecycleFactory.ts => rootLifecycleServiceFactory.ts} | 2 +-
 .../src/services/implementations/rootLogger/index.ts        | 2 +-
 .../{rootLoggerFactory.ts => rootLoggerServiceFactory.ts}   | 2 +-
 .../src/services/implementations/scheduler/index.ts         | 2 +-
 ...dulerFactory.test.ts => schedulerServiceFactory.test.ts} | 4 ++--
 .../{schedulerFactory.ts => schedulerServiceFactory.ts}     | 2 +-
 .../src/services/implementations/tokenManager/index.ts      | 2 +-
 ...erFactory.test.ts => tokenManagerServiceFactory.test.ts} | 4 ++--
 ...tokenManagerFactory.ts => tokenManagerServiceFactory.ts} | 2 +-
 .../src/services/implementations/urlReader/index.ts         | 2 +-
 .../{urlReaderFactory.ts => urlReaderServiceFactory.ts}     | 2 +-
 packages/backend-app-api/src/wiring/BackendInitializer.ts   | 2 +-
 35 files changed, 43 insertions(+), 43 deletions(-)
 rename packages/backend-app-api/src/services/implementations/cache/{cacheFactory.ts => cacheServiceFactory.ts} (94%)
 rename packages/backend-app-api/src/services/implementations/config/{configFactory.ts => configServiceFactory.ts} (95%)
 rename packages/backend-app-api/src/services/implementations/database/{databaseFactory.ts => databaseServiceFactory.ts} (96%)
 rename packages/backend-app-api/src/services/implementations/discovery/{discoveryFactory.ts => discoveryServiceFactory.ts} (93%)
 rename packages/backend-app-api/src/services/implementations/httpRouter/{httpRouterFactory.test.ts => httpRouterServiceFactory.test.ts} (93%)
 rename packages/backend-app-api/src/services/implementations/httpRouter/{httpRouterFactory.ts => httpRouterServiceFactory.ts} (95%)
 rename packages/backend-app-api/src/services/implementations/identity/{identityFactory.ts => identityServiceFactory.ts} (95%)
 rename packages/backend-app-api/src/services/implementations/lifecycle/{lifecycleFactory.ts => lifecycleServiceFactory.ts} (95%)
 rename packages/backend-app-api/src/services/implementations/logger/{loggerFactory.ts => loggerServiceFactory.ts} (94%)
 rename packages/backend-app-api/src/services/implementations/permissions/{permissionsFactory.ts => permissionsServiceFactory.ts} (94%)
 rename packages/backend-app-api/src/services/implementations/rootHttpRouter/{rootHttpRouterFactory.ts => rootHttpRouterServiceFactory.ts} (97%)
 rename packages/backend-app-api/src/services/implementations/rootLifecycle/{rootLifecycleFactory.test.ts => rootLifecycleServiceFactory.test.ts} (95%)
 rename packages/backend-app-api/src/services/implementations/rootLifecycle/{rootLifecycleFactory.ts => rootLifecycleServiceFactory.ts} (96%)
 rename packages/backend-app-api/src/services/implementations/rootLogger/{rootLoggerFactory.ts => rootLoggerServiceFactory.ts} (96%)
 rename packages/backend-app-api/src/services/implementations/scheduler/{schedulerFactory.test.ts => schedulerServiceFactory.test.ts} (94%)
 rename packages/backend-app-api/src/services/implementations/scheduler/{schedulerFactory.ts => schedulerServiceFactory.ts} (95%)
 rename packages/backend-app-api/src/services/implementations/tokenManager/{tokenManagerFactory.test.ts => tokenManagerServiceFactory.test.ts} (91%)
 rename packages/backend-app-api/src/services/implementations/tokenManager/{tokenManagerFactory.ts => tokenManagerServiceFactory.ts} (94%)
 rename packages/backend-app-api/src/services/implementations/urlReader/{urlReaderFactory.ts => urlReaderServiceFactory.ts} (94%)

diff --git a/packages/backend-app-api/src/services/implementations/cache/cacheFactory.ts b/packages/backend-app-api/src/services/implementations/cache/cacheServiceFactory.ts
similarity index 94%
rename from packages/backend-app-api/src/services/implementations/cache/cacheFactory.ts
rename to packages/backend-app-api/src/services/implementations/cache/cacheServiceFactory.ts
index 426a890c00..3ccd2a2fac 100644
--- a/packages/backend-app-api/src/services/implementations/cache/cacheFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/cache/cacheServiceFactory.ts
@@ -21,7 +21,7 @@ import {
 } from '@backstage/backend-plugin-api';
 
 /** @public */
-export const cacheFactory = createServiceFactory({
+export const cacheServiceFactory = createServiceFactory({
   service: coreServices.cache,
   deps: {
     config: coreServices.config,
diff --git a/packages/backend-app-api/src/services/implementations/cache/index.ts b/packages/backend-app-api/src/services/implementations/cache/index.ts
index 3d1bcd75a7..f96ee77182 100644
--- a/packages/backend-app-api/src/services/implementations/cache/index.ts
+++ b/packages/backend-app-api/src/services/implementations/cache/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { cacheFactory } from './cacheFactory';
+export { cacheServiceFactory } from './cacheServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/config/configFactory.ts b/packages/backend-app-api/src/services/implementations/config/configServiceFactory.ts
similarity index 95%
rename from packages/backend-app-api/src/services/implementations/config/configFactory.ts
rename to packages/backend-app-api/src/services/implementations/config/configServiceFactory.ts
index 833730fdbd..459c0d9f0c 100644
--- a/packages/backend-app-api/src/services/implementations/config/configFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/config/configServiceFactory.ts
@@ -35,7 +35,7 @@ export interface ConfigFactoryOptions {
 }
 
 /** @public */
-export const configFactory = createServiceFactory(
+export const configServiceFactory = createServiceFactory(
   (options?: ConfigFactoryOptions) => ({
     service: coreServices.config,
     deps: {},
diff --git a/packages/backend-app-api/src/services/implementations/config/index.ts b/packages/backend-app-api/src/services/implementations/config/index.ts
index b23c47ce0a..690f1e2d36 100644
--- a/packages/backend-app-api/src/services/implementations/config/index.ts
+++ b/packages/backend-app-api/src/services/implementations/config/index.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { configFactory } from './configFactory';
-export type { ConfigFactoryOptions } from './configFactory';
+export { configServiceFactory } from './configServiceFactory';
+export type { ConfigFactoryOptions } from './configServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/database/databaseFactory.ts b/packages/backend-app-api/src/services/implementations/database/databaseServiceFactory.ts
similarity index 96%
rename from packages/backend-app-api/src/services/implementations/database/databaseFactory.ts
rename to packages/backend-app-api/src/services/implementations/database/databaseServiceFactory.ts
index 4d95f863db..05e2f1deb9 100644
--- a/packages/backend-app-api/src/services/implementations/database/databaseFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/database/databaseServiceFactory.ts
@@ -22,7 +22,7 @@ import {
 import { ConfigReader } from '@backstage/config';
 
 /** @public */
-export const databaseFactory = createServiceFactory({
+export const databaseServiceFactory = createServiceFactory({
   service: coreServices.database,
   deps: {
     config: coreServices.config,
diff --git a/packages/backend-app-api/src/services/implementations/database/index.ts b/packages/backend-app-api/src/services/implementations/database/index.ts
index 0045630e15..d676c8013e 100644
--- a/packages/backend-app-api/src/services/implementations/database/index.ts
+++ b/packages/backend-app-api/src/services/implementations/database/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { databaseFactory } from './databaseFactory';
+export { databaseServiceFactory } from './databaseServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/discovery/discoveryFactory.ts b/packages/backend-app-api/src/services/implementations/discovery/discoveryServiceFactory.ts
similarity index 93%
rename from packages/backend-app-api/src/services/implementations/discovery/discoveryFactory.ts
rename to packages/backend-app-api/src/services/implementations/discovery/discoveryServiceFactory.ts
index 51ea3c881d..6c0da8521d 100644
--- a/packages/backend-app-api/src/services/implementations/discovery/discoveryFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/discovery/discoveryServiceFactory.ts
@@ -21,7 +21,7 @@ import {
 } from '@backstage/backend-plugin-api';
 
 /** @public */
-export const discoveryFactory = createServiceFactory({
+export const discoveryServiceFactory = createServiceFactory({
   service: coreServices.discovery,
   deps: {
     config: coreServices.config,
diff --git a/packages/backend-app-api/src/services/implementations/discovery/index.ts b/packages/backend-app-api/src/services/implementations/discovery/index.ts
index 182b9f6cd2..7b3b9816b1 100644
--- a/packages/backend-app-api/src/services/implementations/discovery/index.ts
+++ b/packages/backend-app-api/src/services/implementations/discovery/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { discoveryFactory } from './discoveryFactory';
+export { discoveryServiceFactory } from './discoveryServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.test.ts b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.test.ts
similarity index 93%
rename from packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.test.ts
rename to packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.test.ts
index 150bd628f5..2e124c98b6 100644
--- a/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.test.ts
+++ b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.test.ts
@@ -18,12 +18,12 @@ import {
   HttpRouterService,
   ServiceFactory,
 } from '@backstage/backend-plugin-api';
-import { httpRouterFactory } from './httpRouterFactory';
+import { httpRouterServiceFactory } from './httpRouterServiceFactory';
 
 describe('httpRouterFactory', () => {
   it('should register plugin paths', async () => {
     const rootHttpRouter = { use: jest.fn() };
-    const factory = httpRouterFactory() as Exclude<
+    const factory = httpRouterServiceFactory() as Exclude<
       ServiceFactory<HttpRouterService>,
       { scope: 'root' }
     >;
@@ -55,7 +55,7 @@ describe('httpRouterFactory', () => {
 
   it('should use custom path generator', async () => {
     const rootHttpRouter = { use: jest.fn() };
-    const factory = httpRouterFactory({
+    const factory = httpRouterServiceFactory({
       getPath: id => `/some/${id}/path`,
     }) as Exclude<ServiceFactory<HttpRouterService>, { scope: 'root' }>;
 
diff --git a/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.ts b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.ts
similarity index 95%
rename from packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.ts
rename to packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.ts
index 218910345d..bbd54b7ade 100644
--- a/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterServiceFactory.ts
@@ -31,7 +31,7 @@ export interface HttpRouterFactoryOptions {
 }
 
 /** @public */
-export const httpRouterFactory = createServiceFactory(
+export const httpRouterServiceFactory = createServiceFactory(
   (options?: HttpRouterFactoryOptions) => ({
     service: coreServices.httpRouter,
     deps: {
diff --git a/packages/backend-app-api/src/services/implementations/httpRouter/index.ts b/packages/backend-app-api/src/services/implementations/httpRouter/index.ts
index f2db660414..9dfb01c5be 100644
--- a/packages/backend-app-api/src/services/implementations/httpRouter/index.ts
+++ b/packages/backend-app-api/src/services/implementations/httpRouter/index.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { httpRouterFactory } from './httpRouterFactory';
-export type { HttpRouterFactoryOptions } from './httpRouterFactory';
+export { httpRouterServiceFactory } from './httpRouterServiceFactory';
+export type { HttpRouterFactoryOptions } from './httpRouterServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/identity/identityFactory.ts b/packages/backend-app-api/src/services/implementations/identity/identityServiceFactory.ts
similarity index 95%
rename from packages/backend-app-api/src/services/implementations/identity/identityFactory.ts
rename to packages/backend-app-api/src/services/implementations/identity/identityServiceFactory.ts
index 0031979390..58da1c37d5 100644
--- a/packages/backend-app-api/src/services/implementations/identity/identityFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/identity/identityServiceFactory.ts
@@ -34,7 +34,7 @@ export type IdentityFactoryOptions = {
 };
 
 /** @public */
-export const identityFactory = createServiceFactory(
+export const identityServiceFactory = createServiceFactory(
   (options?: IdentityFactoryOptions) => ({
     service: coreServices.identity,
     deps: {
diff --git a/packages/backend-app-api/src/services/implementations/identity/index.ts b/packages/backend-app-api/src/services/implementations/identity/index.ts
index 9382232620..bf2f4436dd 100644
--- a/packages/backend-app-api/src/services/implementations/identity/index.ts
+++ b/packages/backend-app-api/src/services/implementations/identity/index.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { identityFactory } from './identityFactory';
-export type { IdentityFactoryOptions } from './identityFactory';
+export { identityServiceFactory } from './identityServiceFactory';
+export type { IdentityFactoryOptions } from './identityServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/lifecycle/index.ts b/packages/backend-app-api/src/services/implementations/lifecycle/index.ts
index cfca37a162..8dac4c26b4 100644
--- a/packages/backend-app-api/src/services/implementations/lifecycle/index.ts
+++ b/packages/backend-app-api/src/services/implementations/lifecycle/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { lifecycleFactory } from './lifecycleFactory';
+export { lifecycleServiceFactory } from './lifecycleServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/lifecycle/lifecycleFactory.ts b/packages/backend-app-api/src/services/implementations/lifecycle/lifecycleServiceFactory.ts
similarity index 95%
rename from packages/backend-app-api/src/services/implementations/lifecycle/lifecycleFactory.ts
rename to packages/backend-app-api/src/services/implementations/lifecycle/lifecycleServiceFactory.ts
index 27c1a139fd..79658c0d42 100644
--- a/packages/backend-app-api/src/services/implementations/lifecycle/lifecycleFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/lifecycle/lifecycleServiceFactory.ts
@@ -24,7 +24,7 @@ import {
  * Allows plugins to register shutdown hooks that are run when the process is about to exit.
  * @public
  */
-export const lifecycleFactory = createServiceFactory({
+export const lifecycleServiceFactory = createServiceFactory({
   service: coreServices.lifecycle,
   deps: {
     logger: coreServices.logger,
diff --git a/packages/backend-app-api/src/services/implementations/logger/index.ts b/packages/backend-app-api/src/services/implementations/logger/index.ts
index acef1b178f..ca52bf5193 100644
--- a/packages/backend-app-api/src/services/implementations/logger/index.ts
+++ b/packages/backend-app-api/src/services/implementations/logger/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { loggerFactory } from './loggerFactory';
+export { loggerServiceFactory } from './loggerServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/logger/loggerFactory.ts b/packages/backend-app-api/src/services/implementations/logger/loggerServiceFactory.ts
similarity index 94%
rename from packages/backend-app-api/src/services/implementations/logger/loggerFactory.ts
rename to packages/backend-app-api/src/services/implementations/logger/loggerServiceFactory.ts
index 60c91d0ee6..d9158529ca 100644
--- a/packages/backend-app-api/src/services/implementations/logger/loggerFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/logger/loggerServiceFactory.ts
@@ -20,7 +20,7 @@ import {
 } from '@backstage/backend-plugin-api';
 
 /** @public */
-export const loggerFactory = createServiceFactory({
+export const loggerServiceFactory = createServiceFactory({
   service: coreServices.logger,
   deps: {
     rootLogger: coreServices.rootLogger,
diff --git a/packages/backend-app-api/src/services/implementations/permissions/index.ts b/packages/backend-app-api/src/services/implementations/permissions/index.ts
index 29a6aa237a..781dda31a0 100644
--- a/packages/backend-app-api/src/services/implementations/permissions/index.ts
+++ b/packages/backend-app-api/src/services/implementations/permissions/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { permissionsFactory } from './permissionsFactory';
+export { permissionsServiceFactory } from './permissionsServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/permissions/permissionsFactory.ts b/packages/backend-app-api/src/services/implementations/permissions/permissionsServiceFactory.ts
similarity index 94%
rename from packages/backend-app-api/src/services/implementations/permissions/permissionsFactory.ts
rename to packages/backend-app-api/src/services/implementations/permissions/permissionsServiceFactory.ts
index 4eb05e3e4c..38cba73eda 100644
--- a/packages/backend-app-api/src/services/implementations/permissions/permissionsFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/permissions/permissionsServiceFactory.ts
@@ -21,7 +21,7 @@ import {
 import { ServerPermissionClient } from '@backstage/plugin-permission-node';
 
 /** @public */
-export const permissionsFactory = createServiceFactory({
+export const permissionsServiceFactory = createServiceFactory({
   service: coreServices.permissions,
   deps: {
     config: coreServices.config,
diff --git a/packages/backend-app-api/src/services/implementations/rootHttpRouter/index.ts b/packages/backend-app-api/src/services/implementations/rootHttpRouter/index.ts
index e24662df05..93b997239d 100644
--- a/packages/backend-app-api/src/services/implementations/rootHttpRouter/index.ts
+++ b/packages/backend-app-api/src/services/implementations/rootHttpRouter/index.ts
@@ -15,10 +15,10 @@
  */
 
 export {
-  rootHttpRouterFactory,
+  rootHttpRouterServiceFactory,
   type RootHttpRouterFactoryOptions,
   type RootHttpRouterConfigureOptions,
-} from './rootHttpRouterFactory';
+} from './rootHttpRouterServiceFactory';
 export {
   DefaultRootHttpRouter,
   type DefaultRootHttpRouterOptions,
diff --git a/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts b/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterServiceFactory.ts
similarity index 97%
rename from packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts
rename to packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterServiceFactory.ts
index 816c615817..a14beb428d 100644
--- a/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterServiceFactory.ts
@@ -69,7 +69,7 @@ function defaultConfigure({
 }
 
 /** @public */
-export const rootHttpRouterFactory = createServiceFactory(
+export const rootHttpRouterServiceFactory = createServiceFactory(
   (options?: RootHttpRouterFactoryOptions) => ({
     service: coreServices.rootHttpRouter,
     deps: {
diff --git a/packages/backend-app-api/src/services/implementations/rootLifecycle/index.ts b/packages/backend-app-api/src/services/implementations/rootLifecycle/index.ts
index 8adefbfe84..86589cd23e 100644
--- a/packages/backend-app-api/src/services/implementations/rootLifecycle/index.ts
+++ b/packages/backend-app-api/src/services/implementations/rootLifecycle/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { rootLifecycleFactory } from './rootLifecycleFactory';
+export { rootLifecycleServiceFactory } from './rootLifecycleServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.test.ts b/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleServiceFactory.test.ts
similarity index 95%
rename from packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.test.ts
rename to packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleServiceFactory.test.ts
index 3a93cacc8d..8d2b2af3d5 100644
--- a/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.test.ts
+++ b/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleServiceFactory.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import { BackendLifecycleImpl } from './rootLifecycleFactory';
+import { BackendLifecycleImpl } from './rootLifecycleServiceFactory';
 
 describe('lifecycleService', () => {
   it('should execute registered shutdown hook', async () => {
diff --git a/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.ts b/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleServiceFactory.ts
similarity index 96%
rename from packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.ts
rename to packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleServiceFactory.ts
index 2b6f7eeafe..f379c2ec52 100644
--- a/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleServiceFactory.ts
@@ -65,7 +65,7 @@ export class BackendLifecycleImpl implements RootLifecycleService {
  *
  * @public
  */
-export const rootLifecycleFactory = createServiceFactory({
+export const rootLifecycleServiceFactory = createServiceFactory({
   service: coreServices.rootLifecycle,
   deps: {
     logger: coreServices.rootLogger,
diff --git a/packages/backend-app-api/src/services/implementations/rootLogger/index.ts b/packages/backend-app-api/src/services/implementations/rootLogger/index.ts
index ce5816e6fa..366cd53163 100644
--- a/packages/backend-app-api/src/services/implementations/rootLogger/index.ts
+++ b/packages/backend-app-api/src/services/implementations/rootLogger/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { rootLoggerFactory } from './rootLoggerFactory';
+export { rootLoggerServiceFactory } from './rootLoggerServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/rootLogger/rootLoggerFactory.ts b/packages/backend-app-api/src/services/implementations/rootLogger/rootLoggerServiceFactory.ts
similarity index 96%
rename from packages/backend-app-api/src/services/implementations/rootLogger/rootLoggerFactory.ts
rename to packages/backend-app-api/src/services/implementations/rootLogger/rootLoggerServiceFactory.ts
index 1c2214b98c..11bbd58050 100644
--- a/packages/backend-app-api/src/services/implementations/rootLogger/rootLoggerFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/rootLogger/rootLoggerServiceFactory.ts
@@ -23,7 +23,7 @@ import { transports, format } from 'winston';
 import { createConfigSecretEnumerator } from '../../../config';
 
 /** @public */
-export const rootLoggerFactory = createServiceFactory({
+export const rootLoggerServiceFactory = createServiceFactory({
   service: coreServices.rootLogger,
   deps: {
     config: coreServices.config,
diff --git a/packages/backend-app-api/src/services/implementations/scheduler/index.ts b/packages/backend-app-api/src/services/implementations/scheduler/index.ts
index 8b84906b5b..8b67006a4d 100644
--- a/packages/backend-app-api/src/services/implementations/scheduler/index.ts
+++ b/packages/backend-app-api/src/services/implementations/scheduler/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { schedulerFactory } from './schedulerFactory';
+export { schedulerServiceFactory } from './schedulerServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.test.ts b/packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.test.ts
similarity index 94%
rename from packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.test.ts
rename to packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.test.ts
index 15ec364ac5..7af9de44da 100644
--- a/packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.test.ts
+++ b/packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.test.ts
@@ -19,13 +19,13 @@ import {
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
-import { schedulerFactory } from './schedulerFactory';
+import { schedulerServiceFactory } from './schedulerServiceFactory';
 
 describe('schedulerFactory', () => {
   it('creates sidecar database features', async () => {
     expect.assertions(3);
 
-    const subject = schedulerFactory();
+    const subject = schedulerServiceFactory();
 
     const plugin = createBackendPlugin({
       pluginId: 'example',
diff --git a/packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.ts b/packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.ts
similarity index 95%
rename from packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.ts
rename to packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.ts
index 458c5acfd6..4dfe567ccc 100644
--- a/packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/scheduler/schedulerServiceFactory.ts
@@ -22,7 +22,7 @@ import {
 import { TaskScheduler } from '@backstage/backend-tasks';
 
 /** @public */
-export const schedulerFactory = createServiceFactory({
+export const schedulerServiceFactory = createServiceFactory({
   service: coreServices.scheduler,
   deps: {
     plugin: coreServices.pluginMetadata,
diff --git a/packages/backend-app-api/src/services/implementations/tokenManager/index.ts b/packages/backend-app-api/src/services/implementations/tokenManager/index.ts
index c0685079c4..3ae3d45d2f 100644
--- a/packages/backend-app-api/src/services/implementations/tokenManager/index.ts
+++ b/packages/backend-app-api/src/services/implementations/tokenManager/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { tokenManagerFactory } from './tokenManagerFactory';
+export { tokenManagerServiceFactory } from './tokenManagerServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.test.ts b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerServiceFactory.test.ts
similarity index 91%
rename from packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.test.ts
rename to packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerServiceFactory.test.ts
index abc62fff69..6c33829967 100644
--- a/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.test.ts
+++ b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerServiceFactory.test.ts
@@ -20,13 +20,13 @@ import {
   TokenManagerService,
 } from '@backstage/backend-plugin-api';
 import { ConfigReader } from '@backstage/config';
-import { tokenManagerFactory } from './tokenManagerFactory';
+import { tokenManagerServiceFactory } from './tokenManagerServiceFactory';
 
 describe('tokenManagerFactory', () => {
   it('should create managers that can share tokens in development', async () => {
     (process.env as { NODE_ENV?: string }).NODE_ENV = 'development';
 
-    const factory = tokenManagerFactory() as Exclude<
+    const factory = tokenManagerServiceFactory() as Exclude<
       ServiceFactory<TokenManagerService>,
       { scope: 'root' }
     >;
diff --git a/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerServiceFactory.ts
similarity index 94%
rename from packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts
rename to packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerServiceFactory.ts
index ae0b402eec..b3726176b6 100644
--- a/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerServiceFactory.ts
@@ -21,7 +21,7 @@ import {
 import { ServerTokenManager } from '@backstage/backend-common';
 
 /** @public */
-export const tokenManagerFactory = createServiceFactory({
+export const tokenManagerServiceFactory = createServiceFactory({
   service: coreServices.tokenManager,
   deps: {
     config: coreServices.config,
diff --git a/packages/backend-app-api/src/services/implementations/urlReader/index.ts b/packages/backend-app-api/src/services/implementations/urlReader/index.ts
index 5da0ef4049..6a4b9f65be 100644
--- a/packages/backend-app-api/src/services/implementations/urlReader/index.ts
+++ b/packages/backend-app-api/src/services/implementations/urlReader/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { urlReaderFactory } from './urlReaderFactory';
+export { urlReaderServiceFactory } from './urlReaderServiceFactory';
diff --git a/packages/backend-app-api/src/services/implementations/urlReader/urlReaderFactory.ts b/packages/backend-app-api/src/services/implementations/urlReader/urlReaderServiceFactory.ts
similarity index 94%
rename from packages/backend-app-api/src/services/implementations/urlReader/urlReaderFactory.ts
rename to packages/backend-app-api/src/services/implementations/urlReader/urlReaderServiceFactory.ts
index 1b52ce9604..83e594aa0b 100644
--- a/packages/backend-app-api/src/services/implementations/urlReader/urlReaderFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/urlReader/urlReaderServiceFactory.ts
@@ -21,7 +21,7 @@ import {
 } from '@backstage/backend-plugin-api';
 
 /** @public */
-export const urlReaderFactory = createServiceFactory({
+export const urlReaderServiceFactory = createServiceFactory({
   service: coreServices.urlReader,
   deps: {
     config: coreServices.config,
diff --git a/packages/backend-app-api/src/wiring/BackendInitializer.ts b/packages/backend-app-api/src/wiring/BackendInitializer.ts
index 4bdee8b085..40e2275e2a 100644
--- a/packages/backend-app-api/src/wiring/BackendInitializer.ts
+++ b/packages/backend-app-api/src/wiring/BackendInitializer.ts
@@ -20,7 +20,7 @@ import {
   coreServices,
   ServiceRef,
 } from '@backstage/backend-plugin-api';
-import { BackendLifecycleImpl } from '../services/implementations/rootLifecycle/rootLifecycleFactory';
+import { BackendLifecycleImpl } from '../services/implementations/rootLifecycle/rootLifecycleServiceFactory';
 import {
   BackendRegisterInit,
   EnumerableServiceHolder,