diff --git a/cmd/soroban-rpc/internal/test/cli_test.go b/cmd/soroban-rpc/internal/test/cli_test.go
index 83739cb7f8..264a108591 100644
--- a/cmd/soroban-rpc/internal/test/cli_test.go
+++ b/cmd/soroban-rpc/internal/test/cli_test.go
@@ -81,7 +81,7 @@ func symToScVal(s xdr.ScSymbol) xdr.ScVal {
 	return res
 }
 
-func waitForKey(t *testing.T, test *Test, contractID [32]byte, scValKey xdr.ScVal) {
+func waitForKeyToExpire(t *testing.T, test *Test, contractID [32]byte, scValKey xdr.ScVal) {
 	ch := jhttp.NewChannel(test.sorobanRPCURL(), nil)
 	client := jrpc2.NewClient(ch, nil)
 	// get the counter ledger entry expiration
@@ -184,11 +184,11 @@ func runCLICommand(t *testing.T, cmd string) *icmd.Result {
 	return icmd.RunCmd(cliCmd(t, cmd))
 }
 
-func testAccount(t *testing.T, id uint32) string {
+func getAccountFromID(t *testing.T, id uint32) string {
 	return strings.Trim(runSuccessfulCLICmd(t, fmt.Sprintf("config identity address --hd-path %d", id)), "\n")
 }
 
-func testContractID(t *testing.T, id uint32) [32]byte {
+func getTestContractIDFromAccountAndSalt(t *testing.T, id uint32) [32]byte {
 	return getContractID(t, testAccount(t, id), testSalt, StandaloneNetworkPassphrase)
 }