diff --git a/api/context/store/store.go b/api/context/store/store.go
index 5427f7529..9b943a583 100644
--- a/api/context/store/store.go
+++ b/api/context/store/store.go
@@ -57,7 +57,7 @@ const (
 	LocalContextType = "local"
 	// KubeContextType is the endpoint key in the context endpoints for a new
 	// kube backend
-	KubeContextType = "kube"
+	KubeContextType = "kubernetes"
 )
 
 const (
diff --git a/cli/cmd/context/create_kube.go b/cli/cmd/context/create_kube.go
index c11e204f6..24a91d489 100644
--- a/cli/cmd/context/create_kube.go
+++ b/cli/cmd/context/create_kube.go
@@ -33,16 +33,16 @@ import (
 func init() {
 	extraCommands = append(extraCommands, createKubeCommand)
 	extraHelp = append(extraHelp, `
-Create a Kube context:
-$ docker context create kube CONTEXT [flags]
-(see docker context create kube --help)
+Create a Kubernetes context:
+$ docker context create kubernetes CONTEXT [flags]
+(see docker context create kubernetes --help)
 `)
 }
 
 func createKubeCommand() *cobra.Command {
 	var opts kube.ContextParams
 	cmd := &cobra.Command{
-		Use:   "kube CONTEXT [flags]",
+		Use:   "kubernetes CONTEXT [flags]",
 		Short: "Create context for a Kubernetes Cluster",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {