diff --git a/brontide/noise.go b/brontide/noise.go
index 3c8c5cd74d..a55806399a 100644
--- a/brontide/noise.go
+++ b/brontide/noise.go
@@ -379,7 +379,7 @@ type Machine struct {
 	// errors that cause partial writes.
 	nextHeaderSend []byte
 
-	// nextHeaderBody holds a reference to the remaining body bytes to write
+	// nextBodySend holds a reference to the remaining body bytes to write
 	// out for a pending message. This allows us to tolerate timeout errors
 	// that cause partial writes.
 	nextBodySend []byte
diff --git a/chanfitness/chaneventstore.go b/chanfitness/chaneventstore.go
index c3aa25efd9..8a4d6fbfdc 100644
--- a/chanfitness/chaneventstore.go
+++ b/chanfitness/chaneventstore.go
@@ -85,7 +85,7 @@ type Config struct {
 	// for ease of testing.
 	Clock clock.Clock
 
-	// WriteFlapCounts records the flap count for a set of peers on disk.
+	// WriteFlapCount records the flap count for a set of peers on disk.
 	WriteFlapCount func(map[route.Vertex]*channeldb.FlapCount) error
 
 	// ReadFlapCount gets the flap count for a peer on disk.
diff --git a/channeldb/channel.go b/channeldb/channel.go
index 18db1d2078..046ef8806d 100644
--- a/channeldb/channel.go
+++ b/channeldb/channel.go
@@ -3488,7 +3488,7 @@ type ChannelCloseSummary struct {
 	// per-commitment-point.
 	RemoteNextRevocation *btcec.PublicKey
 
-	// LocalChanCfg is the channel configuration for the local node.
+	// LocalChanConfig is the channel configuration for the local node.
 	LocalChanConfig ChannelConfig
 
 	// LastChanSyncMsg is the ChannelReestablish message for this channel
diff --git a/channeldb/migration21/common/enclosed_types.go b/channeldb/migration21/common/enclosed_types.go
index 58f5c9cf22..d129a6d52a 100644
--- a/channeldb/migration21/common/enclosed_types.go
+++ b/channeldb/migration21/common/enclosed_types.go
@@ -447,7 +447,7 @@ type ChannelCloseSummary struct {
 	// per-commitment-point.
 	RemoteNextRevocation *btcec.PublicKey
 
-	// LocalChanCfg is the channel configuration for the local node.
+	// LocalChanConfig is the channel configuration for the local node.
 	LocalChanConfig ChannelConfig
 
 	// LastChanSyncMsg is the ChannelReestablish message for this channel
diff --git a/channeldb/migration_01_to_11/channel.go b/channeldb/migration_01_to_11/channel.go
index 47cbca3559..ec025263bc 100644
--- a/channeldb/migration_01_to_11/channel.go
+++ b/channeldb/migration_01_to_11/channel.go
@@ -583,7 +583,7 @@ type ChannelCloseSummary struct {
 	// per-commitment-point.
 	RemoteNextRevocation *btcec.PublicKey
 
-	// LocalChanCfg is the channel configuration for the local node.
+	// LocalChanConfig is the channel configuration for the local node.
 	LocalChanConfig ChannelConfig
 
 	// LastChanSyncMsg is the ChannelReestablish message for this channel