diff --git a/packages/stargate/src/queries/auth.spec.ts b/packages/stargate/src/queries/auth.spec.ts
index 14225043..3288cae5 100644
--- a/packages/stargate/src/queries/auth.spec.ts
+++ b/packages/stargate/src/queries/auth.spec.ts
@@ -8,7 +8,7 @@ import { AuthExtension, setupAuthExtension } from "./auth";
 import { QueryClient } from "./queryclient";
 import { toAccAddress } from "./utils";
 
-async function makeAuthClient(rpcUrl: string): Promise<[QueryClient & AuthExtension, TendermintClient]> {
+async function makeClientWithAuth(rpcUrl: string): Promise<[QueryClient & AuthExtension, TendermintClient]> {
   const tmClient = await TendermintClient.connect(rpcUrl);
   return [QueryClient.withExtensions(tmClient, setupAuthExtension), tmClient];
 }
@@ -17,7 +17,7 @@ describe("AuthExtension", () => {
   describe("account", () => {
     it("works for unused account", async () => {
       pendingWithoutSimapp();
-      const [client, tmClient] = await makeAuthClient(simapp.tendermintUrl);
+      const [client, tmClient] = await makeClientWithAuth(simapp.tendermintUrl);
 
       const account = await client.auth.account(unused.address);
       assert(account);
@@ -34,7 +34,7 @@ describe("AuthExtension", () => {
 
     it("works for account with pubkey and non-zero sequence", async () => {
       pendingWithoutSimapp();
-      const [client, tmClient] = await makeAuthClient(simapp.tendermintUrl);
+      const [client, tmClient] = await makeClientWithAuth(simapp.tendermintUrl);
 
       const account = await client.auth.account(validator.address);
       assert(account);
@@ -50,7 +50,7 @@ describe("AuthExtension", () => {
 
     it("returns null for non-existent address", async () => {
       pendingWithoutSimapp();
-      const [client, tmClient] = await makeAuthClient(simapp.tendermintUrl);
+      const [client, tmClient] = await makeClientWithAuth(simapp.tendermintUrl);
 
       const account = await client.auth.account(nonExistentAddress);
       expect(account).toBeNull();
@@ -63,7 +63,7 @@ describe("AuthExtension", () => {
     describe("account", () => {
       it("works for unused account", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeAuthClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithAuth(simapp.tendermintUrl);
 
         const account = await client.auth.unverified.account(unused.address);
         assert(account);
@@ -79,7 +79,7 @@ describe("AuthExtension", () => {
 
       it("works for account with pubkey and non-zero sequence", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeAuthClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithAuth(simapp.tendermintUrl);
 
         const account = await client.auth.unverified.account(validator.address);
         assert(account);
@@ -96,7 +96,7 @@ describe("AuthExtension", () => {
       it("returns null for non-existent address", async () => {
         pending("This fails with Error: Query failed with (1): internal");
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeAuthClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithAuth(simapp.tendermintUrl);
 
         const account = await client.auth.unverified.account(nonExistentAddress);
         expect(account).toBeNull();
diff --git a/packages/stargate/src/queries/bank.spec.ts b/packages/stargate/src/queries/bank.spec.ts
index 9d73e4b1..b45ed5eb 100644
--- a/packages/stargate/src/queries/bank.spec.ts
+++ b/packages/stargate/src/queries/bank.spec.ts
@@ -10,7 +10,7 @@ import {
 import { BankExtension, setupBankExtension } from "./bank";
 import { QueryClient } from "./queryclient";
 
-async function makeBankClient(rpcUrl: string): Promise<[QueryClient & BankExtension, TendermintClient]> {
+async function makeClientWithBank(rpcUrl: string): Promise<[QueryClient & BankExtension, TendermintClient]> {
   const tmClient = await TendermintClient.connect(rpcUrl);
   return [QueryClient.withExtensions(tmClient, setupBankExtension), tmClient];
 }
@@ -19,7 +19,7 @@ describe("BankExtension", () => {
   describe("balance", () => {
     it("works for different existing balances", async () => {
       pendingWithoutSimapp();
-      const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+      const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
       const response1 = await client.bank.balance(unused.address, simapp.denomFee);
       expect(response1).toEqual({
@@ -37,7 +37,7 @@ describe("BankExtension", () => {
 
     it("returns null for non-existent balance", async () => {
       pendingWithoutSimapp();
-      const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+      const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
       const response = await client.bank.balance(unused.address, "gintonic");
       expect(response).toBeNull();
@@ -47,7 +47,7 @@ describe("BankExtension", () => {
 
     it("returns null for non-existent address", async () => {
       pendingWithoutSimapp();
-      const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+      const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
       const response = await client.bank.balance(nonExistentAddress, simapp.denomFee);
       expect(response).toBeNull();
@@ -60,7 +60,7 @@ describe("BankExtension", () => {
     describe("balance", () => {
       it("works for different existing balances", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
         const response1 = await client.bank.unverified.balance(unused.address, simapp.denomFee);
         expect(response1).toEqual({
@@ -78,7 +78,7 @@ describe("BankExtension", () => {
 
       it("returns zero for non-existent balance", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
         const response = await client.bank.unverified.balance(unused.address, "gintonic");
         expect(response).toEqual({
@@ -91,7 +91,7 @@ describe("BankExtension", () => {
 
       it("returns zero for non-existent address", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
         const response = await client.bank.unverified.balance(nonExistentAddress, simapp.denomFee);
         expect(response).toEqual({
@@ -106,7 +106,7 @@ describe("BankExtension", () => {
     describe("allBalances", () => {
       it("returns all balances for unused account", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
         const balances = await client.bank.unverified.allBalances(unused.address);
         expect(balances).toEqual([
@@ -125,7 +125,7 @@ describe("BankExtension", () => {
 
       it("returns an empty list for non-existent account", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
         const balances = await client.bank.unverified.allBalances(nonExistentAddress);
         expect(balances).toEqual([]);
@@ -137,7 +137,7 @@ describe("BankExtension", () => {
     describe("totalSupply", () => {
       it("works", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
         const response = await client.bank.unverified.totalSupply();
         expect(response).toEqual([
@@ -158,7 +158,7 @@ describe("BankExtension", () => {
     describe("supplyOf", () => {
       it("works for existing denom", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
         const response = await client.bank.unverified.supplyOf(simapp.denomFee);
         expect(response).toEqual({
@@ -171,7 +171,7 @@ describe("BankExtension", () => {
 
       it("returns zero for non-existent denom", async () => {
         pendingWithoutSimapp();
-        const [client, tmClient] = await makeBankClient(simapp.tendermintUrl);
+        const [client, tmClient] = await makeClientWithBank(simapp.tendermintUrl);
 
         const response = await client.bank.unverified.supplyOf("gintonic");
         expect(response).toEqual({