diff --git a/cli/manage.go b/cli/manage.go
index ec60c50ce7..62c27c2d98 100644
--- a/cli/manage.go
+++ b/cli/manage.go
@@ -125,7 +125,7 @@ func manage(c *cli.Context) {
 		log.Fatal("--heartbeat should be an unsigned integer and greater than 0")
 	}
 	options := &cluster.Options{
-		TLS:             tlsConfig,
+		TLSConfig:       tlsConfig,
 		OvercommitRatio: c.Float64("overcommit"),
 		Discovery:       dflag,
 		Heartbeat:       hb,
diff --git a/cluster/options.go b/cluster/options.go
index 9871cbecca..5c3b37ffee 100644
--- a/cluster/options.go
+++ b/cluster/options.go
@@ -4,7 +4,7 @@ import "crypto/tls"
 
 // Options is exported
 type Options struct {
-	TLS             *tls.Config
+	TLSConfig       *tls.Config
 	OvercommitRatio float64
 	Discovery       string
 	Heartbeat       uint64
diff --git a/cluster/swarm/cluster.go b/cluster/swarm/cluster.go
index e8add8457f..5f4f2254dc 100644
--- a/cluster/swarm/cluster.go
+++ b/cluster/swarm/cluster.go
@@ -138,7 +138,7 @@ func (c *Cluster) newEntries(entries []*discovery.Entry) {
 		go func(m *discovery.Entry) {
 			if !c.hasEngine(m.String()) {
 				engine := cluster.NewEngine(m.String(), c.options.OvercommitRatio)
-				if err := engine.Connect(c.options.TLS); err != nil {
+				if err := engine.Connect(c.options.TLSConfig); err != nil {
 					log.Error(err)
 					return
 				}
diff --git a/discovery/token/token.go b/discovery/token/token.go
index 4496c37348..bada10ce52 100644
--- a/discovery/token/token.go
+++ b/discovery/token/token.go
@@ -54,16 +54,16 @@ func (s *Discovery) Fetch() ([]*discovery.Entry, error) {
 
 	defer resp.Body.Close()
 
-	var entries []string
+	var addrs []string
 	if resp.StatusCode == http.StatusOK {
-		if err := json.NewDecoder(resp.Body).Decode(&entries); err != nil {
+		if err := json.NewDecoder(resp.Body).Decode(&addrs); err != nil {
 			return nil, err
 		}
 	} else {
 		return nil, fmt.Errorf("Failed to fetch entries, Discovery service returned %d HTTP status code", resp.StatusCode)
 	}
 
-	return discovery.CreateEntries(entries)
+	return discovery.CreateEntries(addrs)
 }
 
 // Watch is exported