diff --git a/pkg/client-sdk/redemption/covenantless_redeem.go b/pkg/client-sdk/redemption/covenantless_redeem.go
index 3d28fcff4..d04ad6bf0 100644
--- a/pkg/client-sdk/redemption/covenantless_redeem.go
+++ b/pkg/client-sdk/redemption/covenantless_redeem.go
@@ -134,7 +134,7 @@ func (r *CovenantlessRedeemBranch) ExpiresAt() (*time.Time, error) {
 	return &t, nil
 }
 
-// offchainPath checks for transactions of the branch onchain and returns only the offchain part
+// OffchainPath checks for transactions of the branch onchain and returns only the offchain part
 func (r *CovenantlessRedeemBranch) OffchainPath() ([]*psbt.Packet, error) {
 	offchainPath := append([]*psbt.Packet{}, r.branch...)
 
diff --git a/server/pkg/kvdb/etcd/db.go b/server/pkg/kvdb/etcd/db.go
index 03d93c620..2d49ad5a0 100644
--- a/server/pkg/kvdb/etcd/db.go
+++ b/server/pkg/kvdb/etcd/db.go
@@ -79,7 +79,7 @@ func (c *commitStatsCollector) PrintStats() string {
 	return s
 }
 
-// updateStatsMap updatess commit stats map for a caller.
+// updateStatMap updatess commit stats map for a caller.
 func updateStatMap(
 	caller string, stats CommitStats, m map[string]*callerStats) {
 
diff --git a/server/pkg/kvdb/etcd/readwrite_tx.go b/server/pkg/kvdb/etcd/readwrite_tx.go
index d690b6ecf..d436014ad 100644
--- a/server/pkg/kvdb/etcd/readwrite_tx.go
+++ b/server/pkg/kvdb/etcd/readwrite_tx.go
@@ -36,7 +36,7 @@ func newReadWriteTx(stm STM, prefix string, lock sync.Locker) *readWriteTx {
 	}
 }
 
-// rooBucket is a helper function to return the always present
+// rootBucket is a helper function to return the always present
 // pseudo root bucket.
 func rootBucket(tx *readWriteTx) *readWriteBucket {
 	return newReadWriteBucket(tx, tx.rootBucketID[:], tx.rootBucketID[:])
diff --git a/server/pkg/macaroons/constraints_test.go b/server/pkg/macaroons/constraints_test.go
index 0a1ece339..e2ddf37cb 100644
--- a/server/pkg/macaroons/constraints_test.go
+++ b/server/pkg/macaroons/constraints_test.go
@@ -80,7 +80,7 @@ func TestTimeoutConstraint(t *testing.T) {
 	}
 }
 
-// TestTimeoutConstraint tests that a caveat for the lifetime of
+// TestIpLockConstraint tests that a caveat for the lifetime of
 // a macaroon is created.
 func TestIpLockConstraint(t *testing.T) {
 	t.Parallel()
diff --git a/server/pkg/macaroons/service.go b/server/pkg/macaroons/service.go
index c1dabaca7..d8d19b41b 100644
--- a/server/pkg/macaroons/service.go
+++ b/server/pkg/macaroons/service.go
@@ -349,7 +349,7 @@ func (svc *Service) ChangePassword(oldPw, newPw []byte) error {
 	return nil
 }
 
-// bakeMacaroon creates a new macaroon with newest version and the given
+// BakeMacaroon creates a new macaroon with newest version and the given
 // permissions then returns it binary serialized.
 func (svc *Service) BakeMacaroon(
 	ctx context.Context, permissions []bakery.Op,