diff --git a/aezeed/bench_test.go b/aezeed/bench_test.go
index c54c17944..3fa0edb21 100644
--- a/aezeed/bench_test.go
+++ b/aezeed/bench_test.go
@@ -11,7 +11,7 @@ var (
 	seed *CipherSeed
 )
 
-// BenchmarkFrommnemonic benchmarks the process of converting a cipher seed
+// BenchmarkTomnemonic benchmarks the process of converting a cipher seed
 // (given the salt), to an enciphered mnemonic.
 func BenchmarkTomnemonic(b *testing.B) {
 	scryptN = 32768
diff --git a/autopilot/agent_test.go b/autopilot/agent_test.go
index 758401868..39e86906e 100644
--- a/autopilot/agent_test.go
+++ b/autopilot/agent_test.go
@@ -254,7 +254,7 @@ func respondMoreChans(t *testing.T, testCtx *testContext, resp moreChansResp) {
 	}
 }
 
-// respondMoreChans consumes the nodeScoresArgs element and responds to the
+// respondNodeScores consumes the nodeScoresArgs element and responds to the
 // agent with the given node scores.
 func respondNodeScores(t *testing.T, testCtx *testContext,
 	resp map[NodeID]*NodeScore) {
@@ -468,7 +468,7 @@ func TestAgentChannelCloseSignal(t *testing.T) {
 	}
 }
 
-// TestAgentBalanceUpdateIncrease ensures that once the agent receives an
+// TestAgentBalanceUpdate ensures that once the agent receives an
 // outside signal concerning a balance update, then it will re-query the
 // heuristic to determine its next action.
 func TestAgentBalanceUpdate(t *testing.T) {
diff --git a/pilot.go b/pilot.go
index b0bb6d9f8..380dc5f09 100644
--- a/pilot.go
+++ b/pilot.go
@@ -17,7 +17,7 @@ import (
 	"github.com/lightningnetwork/lnd/tor"
 )
 
-// validateAtplConfig is a helper method that makes sure the passed
+// validateAtplCfg is a helper method that makes sure the passed
 // configuration is sane. Currently it checks that the heuristic configuration
 // makes sense. In case the config is valid, it will return a list of
 // WeightedHeuristics that can be combined for use with the autopilot agent.
diff --git a/rpcserver.go b/rpcserver.go
index 6b90dab65..e4e8f50ee 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -1932,7 +1932,7 @@ func newFundingShimAssembler(chanPointShim *lnrpc.ChanPointShim, initiator bool,
 	), nil
 }
 
-// newFundingShimAssembler returns a new fully populated
+// newPsbtAssembler returns a new fully populated
 // chanfunding.PsbtAssembler using a FundingShim obtained from an RPC caller.
 func newPsbtAssembler(req *lnrpc.OpenChannelRequest,
 	psbtShim *lnrpc.PsbtShim, netParams *chaincfg.Params) (
diff --git a/server.go b/server.go
index 43390ca57..627f0c0f3 100644
--- a/server.go
+++ b/server.go
@@ -3503,7 +3503,7 @@ func (s *server) nextPeerBackoff(pubStr string,
 	return s.cfg.MinBackoff
 }
 
-// shouldDropConnection determines if our local connection to a remote peer
+// shouldDropLocalConnection determines if our local connection to a remote peer
 // should be dropped in the case of concurrent connection establishment. In
 // order to deterministically decide which connection should be dropped, we'll
 // utilize the ordering of the local and remote public key. If we didn't use