diff --git a/packages/backend/src/asset/service.test.ts b/packages/backend/src/asset/service.test.ts
index 5fd3042012..3814d70a86 100644
--- a/packages/backend/src/asset/service.test.ts
+++ b/packages/backend/src/asset/service.test.ts
@@ -326,7 +326,7 @@ describe('Asset Service', (): void => {
 
       // make sure there is at least 1 wallet address using asset
       const walletAddress = walletAddressService.create({
-        url: 'https://alice.me/.well-known/pay',
+        address: 'https://alice.me/.well-known/pay',
         tenantId: Config.operatorTenantId,
         assetId: newAssetId
       })
diff --git a/packages/backend/src/graphql/resolvers/wallet_address.test.ts b/packages/backend/src/graphql/resolvers/wallet_address.test.ts
index 560b3e1b83..899e3feaad 100644
--- a/packages/backend/src/graphql/resolvers/wallet_address.test.ts
+++ b/packages/backend/src/graphql/resolvers/wallet_address.test.ts
@@ -76,7 +76,7 @@ describe('Wallet Address Resolvers', (): void => {
       input = {
         assetId: asset.id,
         tenantId: Config.operatorTenantId,
-        url: 'https://alice.me/.well-known/pay'
+        address: 'https://alice.me/.well-known/pay'
       }
     })
 
@@ -121,7 +121,7 @@ describe('Wallet Address Resolvers', (): void => {
         expect(response.walletAddress).toEqual({
           __typename: 'WalletAddress',
           id: response.walletAddress.id,
-          url: input.url,
+          address: input.address,
           asset: {
             __typename: 'Asset',
             code: asset.code,
@@ -192,7 +192,7 @@ describe('Wallet Address Resolvers', (): void => {
       expect(response.walletAddress).toEqual({
         __typename: 'WalletAddress',
         id: response.walletAddress.id,
-        url: input.url,
+        address: input.address,
         asset: {
           __typename: 'Asset',
           code: asset.code,
@@ -318,7 +318,7 @@ describe('Wallet Address Resolvers', (): void => {
       const badInputData = {
         tenantId: 'ae4950b6-3e1b-4e50-ad24-25c065bdd3a9',
         assetId: input.assetId,
-        url: input.url
+        address: input.address
       }
       try {
         expect.assertions(2)
diff --git a/packages/backend/src/open_payments/payment/incoming/model.test.ts b/packages/backend/src/open_payments/payment/incoming/model.test.ts
index a71cf23d4b..457759816c 100644
--- a/packages/backend/src/open_payments/payment/incoming/model.test.ts
+++ b/packages/backend/src/open_payments/payment/incoming/model.test.ts
@@ -45,7 +45,7 @@ describe('Models', (): void => {
       walletAddress = await createWalletAddress(deps, {
         tenantId: Config.operatorTenantId
       })
-      baseUrl = new URL(walletAddress.url).origin
+      baseUrl = new URL(walletAddress.address).origin
       incomingPayment = await createIncomingPayment(deps, {
         walletAddressId: walletAddress.id,
         metadata: { description: 'my payment' },
@@ -57,7 +57,7 @@ describe('Models', (): void => {
       test('returns incoming payment', async () => {
         expect(incomingPayment.toOpenPaymentsType(walletAddress)).toEqual({
           id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           completed: incomingPayment.completed,
           receivedAmount: serializeAmount(incomingPayment.receivedAmount),
           incomingAmount: incomingPayment.incomingAmount
@@ -85,7 +85,7 @@ describe('Models', (): void => {
           )
         ).toEqual({
           id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           completed: incomingPayment.completed,
           receivedAmount: serializeAmount(incomingPayment.receivedAmount),
           incomingAmount: incomingPayment.incomingAmount
@@ -110,7 +110,7 @@ describe('Models', (): void => {
           incomingPayment.toOpenPaymentsTypeWithMethods(walletAddress)
         ).toEqual({
           id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           completed: incomingPayment.completed,
           receivedAmount: serializeAmount(incomingPayment.receivedAmount),
           incomingAmount: incomingPayment.incomingAmount
@@ -141,7 +141,7 @@ describe('Models', (): void => {
             )
           ).toEqual({
             id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             completed: incomingPayment.completed,
             receivedAmount: serializeAmount(incomingPayment.receivedAmount),
             incomingAmount: incomingPayment.incomingAmount
diff --git a/packages/backend/src/open_payments/payment/incoming/routes.test.ts b/packages/backend/src/open_payments/payment/incoming/routes.test.ts
index 06b0c69193..e4fbe11a71 100644
--- a/packages/backend/src/open_payments/payment/incoming/routes.test.ts
+++ b/packages/backend/src/open_payments/payment/incoming/routes.test.ts
@@ -59,7 +59,7 @@ describe('Incoming Payment Routes', (): void => {
       tenantId,
       assetId: asset.id
     })
-    baseUrl = new URL(walletAddress.url).origin
+    baseUrl = new URL(walletAddress.address).origin
     incomingAmount = {
       value: BigInt('123'),
       assetScale: asset.scale,
@@ -97,7 +97,7 @@ describe('Incoming Payment Routes', (): void => {
         const response: Partial<OpenPaymentsIncomingPaymentWithPaymentMethods> =
           {
             id: incomingPayment.getUrl(walletAddress),
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             completed: false,
             incomingAmount:
               incomingPayment.incomingAmount &&
@@ -280,7 +280,7 @@ describe('Incoming Payment Routes', (): void => {
 
         expect(ctx.response.body).toEqual({
           id: `${baseUrl}/${tenantId}/incoming-payments/${incomingPaymentId}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           incomingAmount: incomingAmount ? amount : undefined,
           expiresAt: expiresAt || expect.any(String),
           createdAt: expect.any(String),
@@ -335,7 +335,7 @@ describe('Incoming Payment Routes', (): void => {
       expect(ctx.response).toSatisfyApiSpec()
       expect(ctx.body).toEqual({
         id: incomingPayment.getUrl(walletAddress),
-        walletAddress: walletAddress.url,
+        walletAddress: walletAddress.address,
         incomingAmount: {
           value: '123',
           assetCode: asset.code,
diff --git a/packages/backend/src/open_payments/payment/incoming/service.test.ts b/packages/backend/src/open_payments/payment/incoming/service.test.ts
index afacfd0452..f0c9ab2ea6 100644
--- a/packages/backend/src/open_payments/payment/incoming/service.test.ts
+++ b/packages/backend/src/open_payments/payment/incoming/service.test.ts
@@ -60,7 +60,7 @@ describe('Incoming Payment Service', (): void => {
       assetId: asset.id
     })
     walletAddressId = address.id
-    client = address.url
+    client = address.address
   })
 
   afterEach(async (): Promise<void> => {
diff --git a/packages/backend/src/open_payments/payment/outgoing/model.ts b/packages/backend/src/open_payments/payment/outgoing/model.ts
index 302d8ba72e..3a9b8201d4 100644
--- a/packages/backend/src/open_payments/payment/outgoing/model.ts
+++ b/packages/backend/src/open_payments/payment/outgoing/model.ts
@@ -108,7 +108,7 @@ export class OutgoingPayment
   }
 
   public getUrl(walletAddress: WalletAddress): string {
-    const url = new URL(walletAddress.url)
+    const url = new URL(walletAddress.address)
     return `${url.origin}/${this.tenantId}${OutgoingPayment.urlPath}/${this.id}`
   }
 
@@ -206,7 +206,7 @@ export class OutgoingPayment
   ): OpenPaymentsOutgoingPayment {
     return {
       id: this.getUrl(walletAddress),
-      walletAddress: walletAddress.url,
+      walletAddress: walletAddress.address,
       quoteId: this.quote?.getUrl(walletAddress) ?? undefined,
       receiveAmount: serializeAmount(this.receiveAmount),
       debitAmount: serializeAmount(this.debitAmount),
diff --git a/packages/backend/src/open_payments/payment/outgoing/routes.test.ts b/packages/backend/src/open_payments/payment/outgoing/routes.test.ts
index 98a744f1e3..3e086028ef 100644
--- a/packages/backend/src/open_payments/payment/outgoing/routes.test.ts
+++ b/packages/backend/src/open_payments/payment/outgoing/routes.test.ts
@@ -84,7 +84,7 @@ describe('Outgoing Payment Routes', (): void => {
       tenantId,
       assetId: asset.id
     })
-    baseUrl = new URL(walletAddress.url).origin
+    baseUrl = new URL(walletAddress.address).origin
   })
 
   afterEach(async (): Promise<void> => {
@@ -121,7 +121,7 @@ describe('Outgoing Payment Routes', (): void => {
       getBody: (outgoingPayment) => {
         return {
           id: `${baseUrl}/${tenantId}/outgoing-payments/${outgoingPayment.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           receiver: outgoingPayment.receiver,
           quoteId: outgoingPayment.quote.getUrl(walletAddress),
           debitAmount: serializeAmount(outgoingPayment.debitAmount),
@@ -252,7 +252,7 @@ describe('Outgoing Payment Routes', (): void => {
             .pop()
           expect(ctx.response.body).toEqual({
             id: `${baseUrl}/${tenantId}/outgoing-payments/${outgoingPaymentId}`,
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             receiver: payment.receiver,
             quoteId:
               'quoteId' in options ? options.quoteId : expect.any(String),
diff --git a/packages/backend/src/open_payments/payment/outgoing/service.test.ts b/packages/backend/src/open_payments/payment/outgoing/service.test.ts
index 05007973d3..5362532ab3 100644
--- a/packages/backend/src/open_payments/payment/outgoing/service.test.ts
+++ b/packages/backend/src/open_payments/payment/outgoing/service.test.ts
@@ -281,7 +281,7 @@ describe('OutgoingPaymentService', (): void => {
       assetId: sendAssetId
     })
     walletAddressId = walletAddress.id
-    client = walletAddress.url
+    client = walletAddress.address
     const { id: destinationAssetId } = await createAsset(deps, destinationAsset)
     receiverWalletAddress = await createWalletAddress(deps, {
       tenantId,
diff --git a/packages/backend/src/open_payments/quote/model.ts b/packages/backend/src/open_payments/quote/model.ts
index a05352e228..104430496b 100644
--- a/packages/backend/src/open_payments/quote/model.ts
+++ b/packages/backend/src/open_payments/quote/model.ts
@@ -66,7 +66,7 @@ export class Quote extends WalletAddressSubresource {
   private debitAmountValue!: bigint
 
   public getUrl(walletAddress: WalletAddress): string {
-    const url = new URL(walletAddress.url)
+    const url = new URL(walletAddress.address)
     return `${url.origin}/${this.tenantId}${Quote.urlPath}/${this.id}`
   }
 
@@ -134,7 +134,7 @@ export class Quote extends WalletAddressSubresource {
   public toOpenPaymentsType(walletAddress: WalletAddress): OpenPaymentsQuote {
     return {
       id: this.getUrl(walletAddress),
-      walletAddress: walletAddress.url,
+      walletAddress: walletAddress.address,
       receiveAmount: serializeAmount(this.receiveAmount),
       debitAmount: serializeAmount(this.debitAmount),
       receiver: this.receiver,
diff --git a/packages/backend/src/open_payments/quote/routes.test.ts b/packages/backend/src/open_payments/quote/routes.test.ts
index 9796f94c9f..d3e0a7265f 100644
--- a/packages/backend/src/open_payments/quote/routes.test.ts
+++ b/packages/backend/src/open_payments/quote/routes.test.ts
@@ -109,7 +109,7 @@ describe('Quote Routes', (): void => {
       getBody: (quote) => {
         return {
           id: `${baseUrl}/${quote.tenantId}/quotes/${quote.id}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           receiver: quote.receiver,
           debitAmount: serializeAmount(quote.debitAmount),
           receiveAmount: serializeAmount(quote.receiveAmount),
@@ -145,7 +145,7 @@ describe('Quote Routes', (): void => {
 
     test('returns error on invalid debitAmount asset', async (): Promise<void> => {
       options = {
-        walletAddress: walletAddress.url,
+        walletAddress: walletAddress.address,
         receiver,
         debitAmount: {
           ...debitAmount,
@@ -174,7 +174,7 @@ describe('Quote Routes', (): void => {
         '$description',
         async ({ debitAmount, receiveAmount }): Promise<void> => {
           options = {
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             receiver,
             method: 'ilp'
           }
@@ -227,7 +227,7 @@ describe('Quote Routes', (): void => {
           assert.ok(quote)
           expect(ctx.response.body).toEqual({
             id: `${baseUrl}/${tenantId}/quotes/${quoteId}`,
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             receiver: quote.receiver,
             debitAmount: {
               ...quote.debitAmount,
@@ -246,7 +246,7 @@ describe('Quote Routes', (): void => {
 
       test('receiver.incomingAmount', async (): Promise<void> => {
         options = {
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           receiver,
           method: 'ilp'
         }
@@ -279,7 +279,7 @@ describe('Quote Routes', (): void => {
         assert.ok(quote)
         expect(ctx.response.body).toEqual({
           id: `${baseUrl}/${tenantId}/quotes/${quoteId}`,
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           receiver: options.receiver,
           debitAmount: {
             ...quote.debitAmount,
diff --git a/packages/backend/src/open_payments/quote/service.test.ts b/packages/backend/src/open_payments/quote/service.test.ts
index ef91ab9568..26b0663d71 100644
--- a/packages/backend/src/open_payments/quote/service.test.ts
+++ b/packages/backend/src/open_payments/quote/service.test.ts
@@ -144,7 +144,7 @@ describe('QuoteService', (): void => {
         createQuote(deps, {
           tenantId,
           walletAddressId: sendingWalletAddress.id,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount: {
             value: BigInt(56),
             assetCode: asset.code,
@@ -446,7 +446,7 @@ describe('QuoteService', (): void => {
         quoteService.create({
           tenantId: unknownTenantId,
           walletAddressId: walletAddress.id,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount,
           method: 'ilp'
         })
@@ -466,7 +466,7 @@ describe('QuoteService', (): void => {
         quoteService.create({
           tenantId,
           walletAddressId: unknownWalletAddressId,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount,
           method: 'ilp'
         })
@@ -490,7 +490,7 @@ describe('QuoteService', (): void => {
         quoteService.create({
           tenantId,
           walletAddressId: walletAddress.id,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount,
           method: 'ilp'
         })
@@ -502,7 +502,7 @@ describe('QuoteService', (): void => {
         quoteService.create({
           tenantId,
           walletAddressId: sendingWalletAddress.id,
-          receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
+          receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
           debitAmount,
           method: 'ilp'
         })
diff --git a/packages/backend/src/open_payments/receiver/model.test.ts b/packages/backend/src/open_payments/receiver/model.test.ts
index 5ed02b0144..d74c814ab3 100644
--- a/packages/backend/src/open_payments/receiver/model.test.ts
+++ b/packages/backend/src/open_payments/receiver/model.test.ts
@@ -65,7 +65,7 @@ describe('Receiver Model', (): void => {
         sharedSecret: expect.any(Buffer),
         incomingPayment: {
           id: incomingPayment.getUrl(walletAddress),
-          walletAddress: walletAddress.url,
+          walletAddress: walletAddress.address,
           updatedAt: incomingPayment.updatedAt,
           createdAt: incomingPayment.createdAt,
           completed: incomingPayment.completed,
diff --git a/packages/backend/src/open_payments/receiver/service.test.ts b/packages/backend/src/open_payments/receiver/service.test.ts
index 2077703d1c..ee029f467a 100644
--- a/packages/backend/src/open_payments/receiver/service.test.ts
+++ b/packages/backend/src/open_payments/receiver/service.test.ts
@@ -105,7 +105,7 @@ describe('Receiver Service', (): void => {
           sharedSecret: expect.any(Buffer),
           incomingPayment: {
             id: incomingPayment.getUrl(walletAddress),
-            walletAddress: walletAddress.url,
+            walletAddress: walletAddress.address,
             incomingAmount: incomingPayment.incomingAmount,
             receivedAmount: incomingPayment.receivedAmount,
             completed: false,
@@ -315,7 +315,7 @@ describe('Receiver Service', (): void => {
             'create'
           )
           const receiver = await receiverService.create({
-            walletAddressUrl: walletAddress.url,
+            walletAddressUrl: walletAddress.address,
             incomingAmount,
             expiresAt,
             metadata,
@@ -367,7 +367,7 @@ describe('Receiver Service', (): void => {
 
         await expect(
           receiverService.create({
-            walletAddressUrl: walletAddress.url,
+            walletAddressUrl: walletAddress.address,
             tenantId
           })
         ).resolves.toEqual(ReceiverError.InvalidAmount)
@@ -380,7 +380,7 @@ describe('Receiver Service', (): void => {
 
         await expect(
           receiverService.create({
-            walletAddressUrl: walletAddress.url,
+            walletAddressUrl: walletAddress.address,
             tenantId
           })
         ).rejects.toThrow(
diff --git a/packages/backend/src/open_payments/wallet_address/key/routes.test.ts b/packages/backend/src/open_payments/wallet_address/key/routes.test.ts
index 0ea2017292..3e2203a0e8 100644
--- a/packages/backend/src/open_payments/wallet_address/key/routes.test.ts
+++ b/packages/backend/src/open_payments/wallet_address/key/routes.test.ts
@@ -61,7 +61,7 @@ describe('Wallet Address Keys Routes', (): void => {
         headers: { Accept: 'application/json' },
         url: `/jwks.json`
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
 
       await expect(walletAddressKeyRoutes.get(ctx)).resolves.toBeUndefined()
       expect(ctx.response).toSatisfyApiSpec()
@@ -79,7 +79,7 @@ describe('Wallet Address Keys Routes', (): void => {
         headers: { Accept: 'application/json' },
         url: `/jwks.json`
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
 
       await expect(walletAddressKeyRoutes.get(ctx)).resolves.toBeUndefined()
       expect(ctx.body).toEqual({
@@ -134,7 +134,7 @@ describe('Wallet Address Keys Routes', (): void => {
       const ctx = createContext<WalletAddressUrlContext>({
         headers: { Accept: 'application/json' }
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
 
       const getOrPollByUrlSpy = jest.spyOn(
         walletAddressService,
diff --git a/packages/backend/src/open_payments/wallet_address/middleware.test.ts b/packages/backend/src/open_payments/wallet_address/middleware.test.ts
index 3ae2438ec1..2f860cabc4 100644
--- a/packages/backend/src/open_payments/wallet_address/middleware.test.ts
+++ b/packages/backend/src/open_payments/wallet_address/middleware.test.ts
@@ -142,7 +142,7 @@ describe('Wallet Address Middleware', (): void => {
       jest.spyOn(incomingPaymentService, 'get').mockResolvedValueOnce({
         id: incomingPaymentId,
         walletAddress: {
-          url: walletAddressUrl
+          address: walletAddressUrl
         }
       } as IncomingPayment)
 
@@ -203,7 +203,7 @@ describe('Wallet Address Middleware', (): void => {
       jest.spyOn(quoteService, 'get').mockResolvedValueOnce({
         id: quoteId,
         walletAddress: {
-          url: walletAddressUrl
+          address: walletAddressUrl
         }
       } as Quote)
 
@@ -319,7 +319,7 @@ describe('Wallet Address Middleware', (): void => {
       jest.spyOn(outgoingPaymentService, 'get').mockResolvedValueOnce({
         id: outgoingPaymentId,
         walletAddress: {
-          url: walletAddressUrl
+          address: walletAddressUrl
         }
       } as OutgoingPayment)
 
@@ -465,7 +465,7 @@ describe('Wallet Address Middleware', (): void => {
       const walletAddress = await createWalletAddress(deps, {
         tenantId: Config.operatorTenantId
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
 
       await walletAddress.$query().patch({ deactivatedAt: new Date() })
 
@@ -484,7 +484,7 @@ describe('Wallet Address Middleware', (): void => {
       const walletAddress = await createWalletAddress(deps, {
         tenantId: Config.operatorTenantId
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
 
       await expect(
         getWalletAddressForSubresource(ctx, next)
diff --git a/packages/backend/src/open_payments/wallet_address/middleware.ts b/packages/backend/src/open_payments/wallet_address/middleware.ts
index 49fa7c3f21..fefadbe10c 100644
--- a/packages/backend/src/open_payments/wallet_address/middleware.ts
+++ b/packages/backend/src/open_payments/wallet_address/middleware.ts
@@ -54,7 +54,7 @@ export async function getWalletAddressUrlFromIncomingPayment(
     })
   }
 
-  ctx.walletAddressUrl = incomingPayment.walletAddress.url
+  ctx.walletAddressUrl = incomingPayment.walletAddress.address
   await next()
 }
 
@@ -77,7 +77,7 @@ export async function getWalletAddressUrlFromOutgoingPayment(
     })
   }
 
-  ctx.walletAddressUrl = outgoingPayment.walletAddress.url
+  ctx.walletAddressUrl = outgoingPayment.walletAddress.address
   await next()
 }
 
@@ -98,7 +98,7 @@ export async function getWalletAddressUrlFromQuote(
     })
   }
 
-  ctx.walletAddressUrl = quote.walletAddress.url
+  ctx.walletAddressUrl = quote.walletAddress.address
   await next()
 }
 
diff --git a/packages/backend/src/open_payments/wallet_address/model.test.ts b/packages/backend/src/open_payments/wallet_address/model.test.ts
index 3dd586873d..cd665610c7 100644
--- a/packages/backend/src/open_payments/wallet_address/model.test.ts
+++ b/packages/backend/src/open_payments/wallet_address/model.test.ts
@@ -58,7 +58,7 @@ export const setup = <
     options.params
   )
   ctx.walletAddress = options.walletAddress
-  ctx.walletAddressUrl = options.walletAddress.url
+  ctx.walletAddressUrl = options.walletAddress.address
   ctx.grant = options.grant
   ctx.client = options.client
   ctx.accessAction = options.accessAction
diff --git a/packages/backend/src/open_payments/wallet_address/routes.test.ts b/packages/backend/src/open_payments/wallet_address/routes.test.ts
index e30d4056fb..0881834478 100644
--- a/packages/backend/src/open_payments/wallet_address/routes.test.ts
+++ b/packages/backend/src/open_payments/wallet_address/routes.test.ts
@@ -71,7 +71,7 @@ describe('Wallet Address Routes', (): void => {
       const ctx = createContext<WalletAddressUrlContext>({
         headers: { Accept: 'application/json' }
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
 
       const getOrPollByUrlSpy = jest.spyOn(
         walletAddressService,
@@ -112,11 +112,11 @@ describe('Wallet Address Routes', (): void => {
         headers: { Accept: 'application/json' },
         url: '/'
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
       await expect(walletAddressRoutes.get(ctx)).resolves.toBeUndefined()
       expect(ctx.response).toSatisfyApiSpec()
       expect(ctx.body).toEqual({
-        id: walletAddress.url,
+        id: walletAddress.address,
         publicName: walletAddress.publicName,
         assetCode: walletAddress.asset.code,
         assetScale: walletAddress.asset.scale,
@@ -156,11 +156,11 @@ describe('Wallet Address Routes', (): void => {
         headers: { Accept: 'application/json' },
         url: '/'
       })
-      ctx.walletAddressUrl = walletAddress.url
+      ctx.walletAddressUrl = walletAddress.address
       await expect(walletAddressRoutes.get(ctx)).resolves.toBeUndefined()
       expect(ctx.response).toSatisfyApiSpec()
       expect(ctx.body).toEqual({
-        id: walletAddress.url,
+        id: walletAddress.address,
         publicName: walletAddress.publicName,
         assetCode: walletAddress.asset.code,
         assetScale: walletAddress.asset.scale,
diff --git a/packages/backend/src/shared/pagination.test.ts b/packages/backend/src/shared/pagination.test.ts
index 85d3df3e01..b8156613e4 100644
--- a/packages/backend/src/shared/pagination.test.ts
+++ b/packages/backend/src/shared/pagination.test.ts
@@ -66,9 +66,9 @@ describe('Pagination', (): void => {
             first,
             last,
             cursor,
-            'wallet-address': walletAddress.url
+            'wallet-address': walletAddress.address
           })
-        ).toEqual({ ...result, walletAddress: walletAddress.url })
+        ).toEqual({ ...result, walletAddress: walletAddress.address })
       }
     )
   })
@@ -144,7 +144,7 @@ describe('Pagination', (): void => {
                   pagination
                 }),
               page,
-              walletAddress: defaultWalletAddress.url
+              walletAddress: defaultWalletAddress.address
             })
             expect(pageInfo).toEqual({
               startCursor: paymentIds[start],
@@ -179,7 +179,7 @@ describe('Pagination', (): void => {
               const payment = await createOutgoingPayment(deps, {
                 tenantId,
                 walletAddressId: defaultWalletAddress.id,
-                receiver: secondaryWalletAddress.url,
+                receiver: secondaryWalletAddress.address,
                 method: 'ilp',
                 debitAmount,
                 validDestination: false
@@ -202,7 +202,7 @@ describe('Pagination', (): void => {
                   pagination
                 }),
               page,
-              walletAddress: defaultWalletAddress.url
+              walletAddress: defaultWalletAddress.address
             })
             expect(pageInfo).toEqual({
               startCursor: paymentIds[start],
@@ -237,7 +237,7 @@ describe('Pagination', (): void => {
               const quote = await createQuote(deps, {
                 tenantId,
                 walletAddressId: defaultWalletAddress.id,
-                receiver: secondaryWalletAddress.url,
+                receiver: secondaryWalletAddress.address,
                 debitAmount,
                 validDestination: false,
                 method: 'ilp'
@@ -260,7 +260,7 @@ describe('Pagination', (): void => {
                   pagination
                 }),
               page,
-              walletAddress: defaultWalletAddress.url
+              walletAddress: defaultWalletAddress.address
             })
             expect(pageInfo).toEqual({
               startCursor: quoteIds[start],