diff --git a/go/teams/nonce.go b/go/teams/nonce.go
index 37d528b42029..19a2bde03304 100644
--- a/go/teams/nonce.go
+++ b/go/teams/nonce.go
@@ -26,7 +26,7 @@ func newNonce24() (*nonce24, error) {
 	return &nonce24{prefix: prefix}, nil
 }
 
-// newNonce24 creates a nonce with a random 20 byte prefix and
+// newNonce24SkipZero creates a nonce with a random 20 byte prefix and
 // a counter starting at 1.
 func newNonce24SkipZero() (*nonce24, error) {
 	n, err := newNonce24()
diff --git a/go/teams/resolve.go b/go/teams/resolve.go
index f85797552f7a..e3530deedbe3 100644
--- a/go/teams/resolve.go
+++ b/go/teams/resolve.go
@@ -125,7 +125,7 @@ func ResolveImplicitTeamDisplayName(ctx context.Context, g *libkb.GlobalContext,
 	return res, err
 }
 
-// preventTeamCreationOnError checks if an error coming from resolver should
+// shouldPreventTeamCreation checks if an error coming from resolver should
 // prevent us from creating a team. We don't want a team where we don't know if
 // SBS user is resolvable but we just were unable to get the answer.
 func shouldPreventTeamCreation(err error) bool {
diff --git a/go/updater/watchdog/watchdog.go b/go/updater/watchdog/watchdog.go
index 345ed67bf63b..6033fa1c1821 100644
--- a/go/updater/watchdog/watchdog.go
+++ b/go/updater/watchdog/watchdog.go
@@ -133,7 +133,7 @@ func (w *Watchdog) heartbeatToLog(delay time.Duration) {
 	}
 }
 
-// watchProgram will monitor a program and restart it if it exits.
+// startProgram will monitor a program and restart it if it exits.
 // This method will run forever.
 func (w *Watchdog) startProgram(idx int) {
 	program := &(w.Programs[idx])