diff --git a/components/cli/client.go b/components/cli/client.go
index 4c0f097e53..75cfc8698b 100644
--- a/components/cli/client.go
+++ b/components/cli/client.go
@@ -86,7 +86,7 @@ type Client struct {
 // NewEnvClient initializes a new API client based on environment variables.
 // Use DOCKER_HOST to set the url to the docker server.
 // Use DOCKER_API_VERSION to set the version of the API to reach, leave empty for latest.
-// Use DOCKER_CERT_PATH to load the tls certificates from.
+// Use DOCKER_CERT_PATH to load the TLS certificates from.
 // Use DOCKER_TLS_VERIFY to enable or disable TLS verification, off by default.
 func NewEnvClient() (*Client, error) {
 	var client *http.Client
diff --git a/components/cli/client_test.go b/components/cli/client_test.go
index 3a6575c9cc..7c26403ebe 100644
--- a/components/cli/client_test.go
+++ b/components/cli/client_test.go
@@ -102,11 +102,11 @@ func TestNewEnvClient(t *testing.T) {
 			// pedantic checking that this is handled correctly
 			tr := apiclient.client.Transport.(*http.Transport)
 			if tr.TLSClientConfig == nil {
-				t.Error("no tls config found when DOCKER_TLS_VERIFY enabled")
+				t.Error("no TLS config found when DOCKER_TLS_VERIFY enabled")
 			}
 
 			if tr.TLSClientConfig.InsecureSkipVerify {
-				t.Error("tls verification should be enabled")
+				t.Error("TLS verification should be enabled")
 			}
 		}
 
diff --git a/components/cli/swarm_init.go b/components/cli/swarm_init.go
index fd45d066e3..9e65e1cca4 100644
--- a/components/cli/swarm_init.go
+++ b/components/cli/swarm_init.go
@@ -7,7 +7,7 @@ import (
 	"golang.org/x/net/context"
 )
 
-// SwarmInit initializes the Swarm.
+// SwarmInit initializes the swarm.
 func (cli *Client) SwarmInit(ctx context.Context, req swarm.InitRequest) (string, error) {
 	serverResp, err := cli.post(ctx, "/swarm/init", nil, req, nil)
 	if err != nil {
diff --git a/components/cli/swarm_inspect.go b/components/cli/swarm_inspect.go
index 6d95cfc05e..77e72f8466 100644
--- a/components/cli/swarm_inspect.go
+++ b/components/cli/swarm_inspect.go
@@ -7,7 +7,7 @@ import (
 	"golang.org/x/net/context"
 )
 
-// SwarmInspect inspects the Swarm.
+// SwarmInspect inspects the swarm.
 func (cli *Client) SwarmInspect(ctx context.Context) (swarm.Swarm, error) {
 	serverResp, err := cli.get(ctx, "/swarm", nil, nil)
 	if err != nil {
diff --git a/components/cli/swarm_join.go b/components/cli/swarm_join.go
index cda99930eb..19e5192b9e 100644
--- a/components/cli/swarm_join.go
+++ b/components/cli/swarm_join.go
@@ -5,7 +5,7 @@ import (
 	"golang.org/x/net/context"
 )
 
-// SwarmJoin joins the Swarm.
+// SwarmJoin joins the swarm.
 func (cli *Client) SwarmJoin(ctx context.Context, req swarm.JoinRequest) error {
 	resp, err := cli.post(ctx, "/swarm/join", nil, req, nil)
 	ensureReaderClosed(resp)
diff --git a/components/cli/swarm_leave.go b/components/cli/swarm_leave.go
index a4df732174..3a205cf3b5 100644
--- a/components/cli/swarm_leave.go
+++ b/components/cli/swarm_leave.go
@@ -6,7 +6,7 @@ import (
 	"golang.org/x/net/context"
 )
 
-// SwarmLeave leaves the Swarm.
+// SwarmLeave leaves the swarm.
 func (cli *Client) SwarmLeave(ctx context.Context, force bool) error {
 	query := url.Values{}
 	if force {
diff --git a/components/cli/swarm_update.go b/components/cli/swarm_update.go
index cc8eeb6554..7245fd4e38 100644
--- a/components/cli/swarm_update.go
+++ b/components/cli/swarm_update.go
@@ -9,7 +9,7 @@ import (
 	"golang.org/x/net/context"
 )
 
-// SwarmUpdate updates the Swarm.
+// SwarmUpdate updates the swarm.
 func (cli *Client) SwarmUpdate(ctx context.Context, version swarm.Version, swarm swarm.Spec, flags swarm.UpdateFlags) error {
 	query := url.Values{}
 	query.Set("version", strconv.FormatUint(version.Index, 10))
diff --git a/components/cli/transport.go b/components/cli/transport.go
index 6cd47f2efd..401ab15d30 100644
--- a/components/cli/transport.go
+++ b/components/cli/transport.go
@@ -13,7 +13,7 @@ func (tf transportFunc) RoundTrip(req *http.Request) (*http.Response, error) {
 	return tf(req)
 }
 
-// resolveTLSConfig attempts to resolve the tls configuration from the
+// resolveTLSConfig attempts to resolve the TLS configuration from the
 // RoundTripper.
 func resolveTLSConfig(transport http.RoundTripper) *tls.Config {
 	switch tr := transport.(type) {