diff --git a/lib/logger/logger.go b/lib/logger/logger.go
index fa6f9dce7..5b59a598b 100644
--- a/lib/logger/logger.go
+++ b/lib/logger/logger.go
@@ -63,7 +63,7 @@ type logger struct {
 	mut        sync.Mutex
 }
 
-// The default logger logs to standard output with a time prefix.
+// DefaultLogger logs to standard output with a time prefix.
 var DefaultLogger = New()
 
 func New() Logger {
diff --git a/lib/rc/rc.go b/lib/rc/rc.go
index 1b04e9048..446f9103e 100644
--- a/lib/rc/rc.go
+++ b/lib/rc/rc.go
@@ -31,8 +31,8 @@ import (
 	"github.com/syncthing/syncthing/lib/sync"
 )
 
-// We set the API key via the STGUIAPIKEY variable when we launch the binary,
-// to ensure that we have API access regardless of authentication settings.
+// APIKey is set via the STGUIAPIKEY variable when we launch the binary, to
+// ensure that we have API access regardless of authentication settings.
 const APIKey = "592A47BC-A7DF-4C2F-89E0-A80B3E5094EE"
 
 type Process struct {
diff --git a/lib/upgrade/signingkey.go b/lib/upgrade/signingkey.go
index 9619d46c1..4c76ab05a 100644
--- a/lib/upgrade/signingkey.go
+++ b/lib/upgrade/signingkey.go
@@ -6,8 +6,8 @@
 
 package upgrade
 
-// This is the public key used to verify signed upgrades. It must match the
-// private key used to sign binaries for the built in upgrade mechanism to
+// SigningKey is the public key used to verify signed upgrades. It must match
+// the private key used to sign binaries for the built in upgrade mechanism to
 // accept an upgrade. Keys and signatures can be created and verified with the
 // stsigtool utility. The build script creates signed binaries when given the
 // -sign option.