diff --git a/crypto/blake2b/blake2x.go b/crypto/blake2b/blake2x.go
index 307f66fabd..52c414db0e 100644
--- a/crypto/blake2b/blake2x.go
+++ b/crypto/blake2b/blake2x.go
@@ -13,11 +13,11 @@ import (
 // XOF defines the interface to hash functions that
 // support arbitrary-length output.
 type XOF interface {
-	// Writer absorbs more data into the hash's state. It panics if called
+	// Write absorbs more data into the hash's state. It panics if called
 	// after Read.
 	io.Writer
 
-	// Reader reads more output from the hash. It returns io.EOF if the limit
+	// Read reads more output from the hash. It returns io.EOF if the limit
 	// has been reached.
 	io.Reader
 
diff --git a/p2p/discover/v5wire/msg.go b/p2p/discover/v5wire/msg.go
index 15310330c2..401db2f6c5 100644
--- a/p2p/discover/v5wire/msg.go
+++ b/p2p/discover/v5wire/msg.go
@@ -61,7 +61,7 @@ type (
 		Nonce Nonce
 	}
 
-	// Whoareyou contains the handshake challenge.
+	// WHOAREYOU contains the handshake challenge.
 	Whoareyou struct {
 		ChallengeData []byte   // Encoded challenge
 		Nonce         Nonce    // Nonce of request packet