diff --git a/cmd/syncthing/externaladdr.go b/cmd/syncthing/externaladdr.go
index d9e792ae..5868276a 100644
--- a/cmd/syncthing/externaladdr.go
+++ b/cmd/syncthing/externaladdr.go
@@ -14,13 +14,13 @@ import (
 	"github.com/syncthing/syncthing/lib/config"
 )
 
-type externalAddr struct {
+type addressLister struct {
 	upnpSvc *upnpSvc
 	cfg     *config.Wrapper
 }
 
-func newExternalAddr(upnpSvc *upnpSvc, cfg *config.Wrapper) *externalAddr {
-	return &externalAddr{
+func newAddressLister(upnpSvc *upnpSvc, cfg *config.Wrapper) *addressLister {
+	return &addressLister{
 		upnpSvc: upnpSvc,
 		cfg:     cfg,
 	}
@@ -31,7 +31,7 @@ func newExternalAddr(upnpSvc *upnpSvc, cfg *config.Wrapper) *externalAddr {
 // one or more addresses with an empty IP address (0.0.0.0 or ::) and just
 // port number - this means that the outside address of a NAT gateway should
 // be substituted.
-func (e *externalAddr) ExternalAddresses() []string {
+func (e *addressLister) ExternalAddresses() []string {
 	var addrs []string
 
 	// Grab our listen addresses from the config. Unspecified ones are passed
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index 57483fe3..04fa9eb1 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -687,7 +687,7 @@ func syncthingMain() {
 
 	// The externalAddr tracks our external addresses for discovery purposes.
 
-	var extAddr *externalAddr
+	var addrList *addressLister
 
 	// Start UPnP. The UPnP service will restart global discovery if the
 	// external port changes.
@@ -698,14 +698,14 @@ func syncthingMain() {
 
 		// The external address tracker needs to know about the UPnP service
 		// so it can check for an external mapped port.
-		extAddr = newExternalAddr(upnpSvc, cfg)
+		addrList = newAddressLister(upnpSvc, cfg)
 	} else {
-		extAddr = newExternalAddr(nil, cfg)
+		addrList = newAddressLister(nil, cfg)
 	}
 
 	// Start discovery
 
-	discoverer := discovery(extAddr, relaySvc)
+	discoverer := discovery(addrList, relaySvc)
 
 	// GUI
 
@@ -941,7 +941,7 @@ func shutdown() {
 	stop <- exitSuccess
 }
 
-func discovery(extAddr *externalAddr, relaySvc *relay.Svc) *discover.Discoverer {
+func discovery(addrList *addressLister, relaySvc *relay.Svc) *discover.Discoverer {
 	opts := cfg.Options()
 	disc := discover.NewDiscoverer(myID, opts.ListenAddress, relaySvc)
 	if opts.LocalAnnEnabled {
@@ -955,7 +955,7 @@ func discovery(extAddr *externalAddr, relaySvc *relay.Svc) *discover.Discoverer
 			// to relay servers.
 			time.Sleep(5 * time.Second)
 			l.Infoln("Starting global discovery announcements")
-			disc.StartGlobal(opts.GlobalAnnServers, extAddr)
+			disc.StartGlobal(opts.GlobalAnnServers, addrList)
 		}()
 
 	}