diff --git a/api/context/store/store.go b/api/context/store/store.go
index ba0135958..5427f7529 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 = "k8s"
+	KubeContextType = "kube"
 )
 
 const (
diff --git a/cli/cmd/context/create_kube.go b/cli/cmd/context/create_kube.go
index d10bdd82c..b42370e9a 100644
--- a/cli/cmd/context/create_kube.go
+++ b/cli/cmd/context/create_kube.go
@@ -41,7 +41,7 @@ $ docker context create k8s CONTEXT [flags]
 func createKubeCommand() *cobra.Command {
 	var opts kube.ContextParams
 	cmd := &cobra.Command{
-		Use:   "k8s 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 {