diff --git a/localenv/happy-life-bank/docker-compose.yml b/localenv/happy-life-bank/docker-compose.yml
index a3b76d0cba..465bd030ff 100644
--- a/localenv/happy-life-bank/docker-compose.yml
+++ b/localenv/happy-life-bank/docker-compose.yml
@@ -53,9 +53,7 @@ services:
       CONNECTOR_PORT: 3002
       OPEN_PAYMENTS_PORT: 80
       DATABASE_URL: postgresql://happy_life_bank_backend:happy_life_bank_backend@shared-database/happy_life_bank_backend
-      USE_TIGERBEETLE: ${USE_TIGERBEETLE-false}
-      TIGERBEETLE_CLUSTER_ID: ${TIGERBEETLE_CLUSTER_ID-0}
-      TIGERBEETLE_REPLICA_ADDRESSES: ${TIGERBEETLE_REPLICA_ADDRESSES-''}
+      USE_TIGERBEETLE: false
       AUTH_SERVER_GRANT_URL: ${HAPPY_LIFE_BANK_AUTH_SERVER_DOMAIN:-http://happy-life-bank-auth:3006}
       AUTH_SERVER_INTROSPECTION_URL: http://happy-life-bank-auth:3007
       ILP_ADDRESS: test.happy-life-bank
diff --git a/packages/backend/src/accounting/psql/service.ts b/packages/backend/src/accounting/psql/service.ts
index 7d183fa78f..719e06ba01 100644
--- a/packages/backend/src/accounting/psql/service.ts
+++ b/packages/backend/src/accounting/psql/service.ts
@@ -52,8 +52,8 @@ export function createAccountingService(
   return {
     createLiquidityAccount: (options, accTypeCode, trx) =>
       createLiquidityAccount(deps, options, accTypeCode, trx),
-    createSettlementAccount: (ledger, accountId, trx) =>
-      createSettlementAccount(deps, ledger, accountId, trx),
+    createSettlementAccount: (ledger, relatedAccountId, trx) =>
+      createSettlementAccount(deps, ledger, relatedAccountId, trx),
     createLiquidityAndLinkedSettlementAccount: (options, accTypeCode, trx) =>
       createLiquidityAndLinkedSettlementAccount(
         deps,
@@ -100,7 +100,7 @@ export async function createLiquidityAccount(
 export async function createSettlementAccount(
   deps: ServiceDependencies,
   ledger: number,
-  accountId: string | number,
+  relatedAccountId: string | number,
   trx?: TransactionOrKnex
 ): Promise<void> {
   const asset = await Asset.query(trx || deps.knex).findOne({ ledger })
diff --git a/packages/backend/src/accounting/service.ts b/packages/backend/src/accounting/service.ts
index 4df066307d..1b85507da9 100644
--- a/packages/backend/src/accounting/service.ts
+++ b/packages/backend/src/accounting/service.ts
@@ -102,7 +102,7 @@ export interface AccountingService {
   ): Promise<LiquidityAccount>
   createSettlementAccount(
     ledger: number,
-    accountId: string | number,
+    relatedAccountId: string | number,
     trx?: TransactionOrKnex
   ): Promise<void>
   createLiquidityAndLinkedSettlementAccount(
diff --git a/packages/backend/src/accounting/tigerbeetle/service.ts b/packages/backend/src/accounting/tigerbeetle/service.ts
index 646ba629e4..515988c819 100644
--- a/packages/backend/src/accounting/tigerbeetle/service.ts
+++ b/packages/backend/src/accounting/tigerbeetle/service.ts
@@ -100,8 +100,8 @@ export function createAccountingService(
     // Their account id is the corresponding asset's ledger value.
     createLiquidityAccount: (options, accountType) =>
       createLiquidityAccount(deps, options, accountType),
-    createSettlementAccount: (ledger, accountId) =>
-      createSettlementAccount(deps, ledger, accountId),
+    createSettlementAccount: (ledger, relatedAccountId) =>
+      createSettlementAccount(deps, ledger, relatedAccountId),
     createLiquidityAndLinkedSettlementAccount: (options, accTypeCode) =>
       createLiquidityAndLinkedSettlementAccount(deps, options, accTypeCode),
     getBalance: (id) => getAccountBalance(deps, id),
@@ -151,7 +151,7 @@ export async function createLiquidityAccount(
 export async function createSettlementAccount(
   deps: ServiceDependencies,
   ledger: number,
-  accountId: string | number
+  relatedAccountId: string | number
 ): Promise<void> {
   try {
     await createAccounts(deps, [
@@ -159,7 +159,7 @@ export async function createSettlementAccount(
         id: ledger,
         ledger,
         code: TigerBeetleAccountCode.SETTLEMENT,
-        userData128: toTigerBeetleId(accountId)
+        userData128: toTigerBeetleId(relatedAccountId)
       }
     ])
   } catch (err) {
diff --git a/packages/backend/src/payment-method/ilp/connector/core/test/mocks/accounting-service.ts b/packages/backend/src/payment-method/ilp/connector/core/test/mocks/accounting-service.ts
index 103a4d6371..5b39df56cb 100644
--- a/packages/backend/src/payment-method/ilp/connector/core/test/mocks/accounting-service.ts
+++ b/packages/backend/src/payment-method/ilp/connector/core/test/mocks/accounting-service.ts
@@ -150,7 +150,7 @@ export class MockAccountingService implements AccountingService {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     ledger: number,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    accountId: string | number,
+    relatedAccountId: string | number,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     trx?: TransactionOrKnex
   ): Promise<void> {