diff --git a/cli/command/cli.go b/cli/command/cli.go
index 161163e00b..9bd9ebc2af 100644
--- a/cli/command/cli.go
+++ b/cli/command/cli.go
@@ -210,9 +210,9 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions, ops ...Initialize
 
 	cli.configFile = cliconfig.LoadDefaultConfigFile(cli.err)
 
-	baseContextSore := store.New(cliconfig.ContextStoreDir(), cli.contextStoreConfig)
+	baseContextStore := store.New(cliconfig.ContextStoreDir(), cli.contextStoreConfig)
 	cli.contextStore = &ContextStoreWithDefault{
-		Store: baseContextSore,
+		Store: baseContextStore,
 		Resolver: func() (*DefaultContext, error) {
 			return resolveDefaultContext(opts.Common, cli.ConfigFile(), cli.Err())
 		},
diff --git a/cli/command/defaultcontextstore.go b/cli/command/defaultcontextstore.go
index 9da76df75d..6a55b79086 100644
--- a/cli/command/defaultcontextstore.go
+++ b/cli/command/defaultcontextstore.go
@@ -20,7 +20,7 @@ const (
 	DefaultContextName = "default"
 )
 
-// DefaultContext contains the default context data for all enpoints
+// DefaultContext contains the default context data for all endpoints
 type DefaultContext struct {
 	Meta store.Metadata
 	TLS  store.ContextTLSData