diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go
index 7481fe9424..f9d45913cb 100644
--- a/accounts/keystore/account_cache_test.go
+++ b/accounts/keystore/account_cache_test.go
@@ -51,7 +51,7 @@ var (
 	}
 )
 
-// waitWatcherStarts waits up to 1s for the keystore watcher to start.
+// waitWatcherStart waits up to 1s for the keystore watcher to start.
 func waitWatcherStart(ks *KeyStore) bool {
 	// On systems where file watch is not supported, just return "ok".
 	if !ks.cache.watcher.enabled() {
diff --git a/cmd/geth/attach_test.go b/cmd/geth/attach_test.go
index ddf79450e7..275e81aa50 100644
--- a/cmd/geth/attach_test.go
+++ b/cmd/geth/attach_test.go
@@ -50,7 +50,7 @@ func TestAttachWithHeaders(t *testing.T) {
 	testReceiveHeaders(t, ln, "attach", "-H", "first: one", "-H", "second: two", fmt.Sprintf("http://localhost:%d", port))
 }
 
-// TestAttachWithHeaders tests that 'geth db --remotedb' with custom headers works, i.e
+// TestRemoteDbWithHeaders tests that 'geth db --remotedb' with custom headers works, i.e
 // that custom headers are forwarded to the target.
 func TestRemoteDbWithHeaders(t *testing.T) {
 	t.Parallel()
diff --git a/core/chain_makers.go b/core/chain_makers.go
index d55fcd14cc..f29417b31b 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -510,7 +510,7 @@ func makeBlockChainWithGenesis(genesis *Genesis, n int, engine consensus.Engine,
 	return db, blocks
 }
 
-// makeBlockChain creates a deterministic chain of blocks rooted at parent with fake invalid transactions.
+// makeFakeNonEmptyBlockChain creates a deterministic chain of blocks rooted at parent with fake invalid transactions.
 func makeFakeNonEmptyBlockChain(parent *types.Block, n int, engine consensus.Engine, db ethdb.Database, seed int, numTx int) []*types.Block {
 	blocks, _ := GenerateChain(params.TestChainConfig, parent, engine, db, n, func(i int, b *BlockGen) {
 		addr := common.Address{0: byte(seed), 19: byte(i)}