diff --git a/client/pkg/transport/keepalive_listener.go b/client/pkg/transport/keepalive_listener.go
index 2006a56b7..07b2dc136 100644
--- a/client/pkg/transport/keepalive_listener.go
+++ b/client/pkg/transport/keepalive_listener.go
@@ -111,7 +111,7 @@ func (l *tlsKeepaliveListener) Accept() (c net.Conn, err error) {
 	return c, nil
 }
 
-// NewListener creates a Listener which accepts connections from an inner
+// newTLSKeepaliveListener creates a Listener which accepts connections from an inner
 // Listener and wraps each connection with Server.
 // The configuration config must be non-nil and must have
 // at least one certificate.
diff --git a/client/v3/experimental/recipes/rwmutex.go b/client/v3/experimental/recipes/rwmutex.go
index 9f520baf4..d961ead3f 100644
--- a/client/v3/experimental/recipes/rwmutex.go
+++ b/client/v3/experimental/recipes/rwmutex.go
@@ -63,7 +63,7 @@ func (rwm *RWMutex) Lock() error {
 	}
 }
 
-// waitOnLowest will wait on the last key with a revision < rwm.myKey.Revision with a
+// waitOnLastRev will wait on the last key with a revision < rwm.myKey.Revision with a
 // given prefix. If there are no keys left to wait on, return true.
 func (rwm *RWMutex) waitOnLastRev(pfx string) (bool, error) {
 	client := rwm.s.Client()
diff --git a/server/lease/lease.go b/server/lease/lease.go
index 308d5fe23..983cf3980 100644
--- a/server/lease/lease.go
+++ b/server/lease/lease.go
@@ -56,7 +56,7 @@ func (l *Lease) TTL() int64 {
 	return l.ttl
 }
 
-// RemainingTTL returns the last checkpointed remaining TTL of the lease.
+// getRemainingTTL returns the last checkpointed remaining TTL of the lease.
 func (l *Lease) getRemainingTTL() int64 {
 	if l.remainingTTL > 0 {
 		return l.remainingTTL