diff --git a/rpc/handler.go b/rpc/handler.go
index 241dfef742..8ef29d4aee 100644
--- a/rpc/handler.go
+++ b/rpc/handler.go
@@ -163,7 +163,7 @@ func (h *handler) addRequestOp(op *requestOp) {
 	}
 }
 
-// removeRequestOps stops waiting for the given request IDs.
+// removeRequestOp stops waiting for the given request IDs.
 func (h *handler) removeRequestOp(op *requestOp) {
 	for _, id := range op.ids {
 		delete(h.respWait, string(id))
diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go
index a6c40495da..d9de6546a3 100644
--- a/signer/core/signed_data.go
+++ b/signer/core/signed_data.go
@@ -288,7 +288,7 @@ func (api *SignerAPI) determineSignatureFormat(ctx context.Context, contentType
 	return req, useEthereumV, nil
 }
 
-// SignTextWithValidator signs the given message which can be further recovered
+// SignTextValidator signs the given message which can be further recovered
 // with the given validator.
 // hash = keccak256("\x19\x00"${address}${data}).
 func SignTextValidator(validatorData ValidatorData) (hexutil.Bytes, string) {
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
index 18be12d34a..b8731f8491 100644
--- a/trie/secure_trie.go
+++ b/trie/secure_trie.go
@@ -87,7 +87,7 @@ func (t *SecureTrie) TryGetNode(path []byte) ([]byte, int, error) {
 	return t.trie.TryGetNode(path)
 }
 
-// TryUpdate account will abstract the write of an account to the
+// TryUpdateAccount will abstract the write of an account to the
 // secure trie.
 func (t *SecureTrie) TryUpdateAccount(key []byte, acc *types.StateAccount) error {
 	hk := t.hashKey(key)