diff --git a/dev/api.go b/dev/api.go
index 65a2b19..26e1e4c 100644
--- a/dev/api.go
+++ b/dev/api.go
@@ -587,7 +587,7 @@ func (das *DevAccountService) FetchVouchers(ctx context.Context, publicKey strin
 	//TODO: Iterate over the account acc.Balances object
 	for _, voucher := range das.vouchers {
 		holdings = append(holdings, dataserviceapi.TokenHoldings{
-			ContractAddress: voucher.Address,
+			TokenAddress: voucher.Address,
 			TokenSymbol:     voucher.Symbol,
 			TokenDecimals:   strconv.Itoa(voucher.Decimals),
 			Balance:         strconv.Itoa(int(defaultVoucherBalance)),
@@ -854,7 +854,7 @@ func (das *DevAccountService) GetPoolSwappableFromVouchers(ctx context.Context,
 	}
 	for _, v := range p.Vouchers {
 		swapFromList = append(swapFromList, dataserviceapi.TokenHoldings{
-			ContractAddress: v.Address,
+			TokenAddress: v.Address,
 			TokenSymbol:     v.Symbol,
 			TokenDecimals:   string(defaultDecimals),
 			Balance:         fmt.Sprintf("%f", defaultVoucherBalance),
@@ -872,7 +872,7 @@ func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, pool
 	}
 	for _, voucher := range das.vouchers {
 		swapToList = append(swapToList, dataserviceapi.TokenHoldings{
-			ContractAddress:  voucher.Address,
+			TokenAddress:  voucher.Address,
 			TokenSymbol:   voucher.Symbol,
 			TokenDecimals: strconv.Itoa(voucher.Decimals),
 		})
diff --git a/go.mod b/go.mod
index 2e4c035..8acb98e 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
-	github.com/grassrootseconomics/ussd-data-service v1.5.0-beta
+	github.com/grassrootseconomics/ussd-data-service v1.6.0-beta
 	github.com/stretchr/testify v1.9.0
 )
 
diff --git a/go.sum b/go.sum
index 6480970..470c903 100644
--- a/go.sum
+++ b/go.sum
@@ -26,6 +26,8 @@ github.com/grassrootseconomics/ussd-data-service v1.4.7-beta h1:yAe1YaOBsdxW2m20
 github.com/grassrootseconomics/ussd-data-service v1.4.7-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
 github.com/grassrootseconomics/ussd-data-service v1.5.0-beta h1:BSSQL/yPEvTVku9ja/ENZyZdwZkEaiTzzOUfg72bTy4=
 github.com/grassrootseconomics/ussd-data-service v1.5.0-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
+github.com/grassrootseconomics/ussd-data-service v1.6.0-beta h1:pY6zns6ifXyClRxP+JJaWrged3oRE7tTS2xaftF9clA=
+github.com/grassrootseconomics/ussd-data-service v1.6.0-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
diff --git a/testutil/testservice/account_service.go b/testutil/testservice/account_service.go
index 3177c98..935df73 100644
--- a/testutil/testservice/account_service.go
+++ b/testutil/testservice/account_service.go
@@ -35,10 +35,10 @@ func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey
 func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
 	return []dataserviceapi.TokenHoldings{
 		dataserviceapi.TokenHoldings{
-			ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
-			TokenSymbol:     "SRF",
-			TokenDecimals:   "6",
-			Balance:         "2745987",
+			TokenAddress:  "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
+			TokenSymbol:   "SRF",
+			TokenDecimals: "6",
+			Balance:       "2745987",
 		},
 	}, nil
 }