diff --git a/cli/command/image/pull.go b/cli/command/image/pull.go
index cf15fca706..242ad4a19c 100644
--- a/cli/command/image/pull.go
+++ b/cli/command/image/pull.go
@@ -28,7 +28,7 @@ func NewPullCommand(dockerCli command.Cli) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "pull [OPTIONS] NAME[:TAG|@DIGEST]",
-		Short: "Pull an image or a repository from a registry",
+		Short: "Download an image from a registry",
 		Args:  cli.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.remote = args[0]
diff --git a/cli/command/image/push.go b/cli/command/image/push.go
index e4db32ab8e..771a99592e 100644
--- a/cli/command/image/push.go
+++ b/cli/command/image/push.go
@@ -29,7 +29,7 @@ func NewPushCommand(dockerCli command.Cli) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "push [OPTIONS] NAME[:TAG]",
-		Short: "Push an image or a repository to a registry",
+		Short: "Upload an image to a registry",
 		Args:  cli.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.remote = args[0]
diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish
index d752d56850..dd2c751ec1 100644
--- a/contrib/completion/fish/docker.fish
+++ b/contrib/completion/fish/docker.fish
@@ -414,14 +414,14 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s s -l size -d 'Di
 complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l since -d 'Show only containers created since Id or Name, include non-running ones.'
 
 # pull
-complete -c docker -f -n '__fish_docker_no_subcommand' -a pull -d 'Pull an image or a repository from a Docker registry server'
+complete -c docker -f -n '__fish_docker_no_subcommand' -a pull -d 'Download an image from a registry'
 complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -s a -l all-tags -d 'Download all tagged images in the repository'
 complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -l help -d 'Print usage'
 complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -a '(__fish_print_docker_images)' -d "Image"
 complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -a '(__fish_print_docker_repositories)' -d "Repository"
 
 # push
-complete -c docker -f -n '__fish_docker_no_subcommand' -a push -d 'Push an image or a repository to a Docker registry server'
+complete -c docker -f -n '__fish_docker_no_subcommand' -a push -d 'Upload an image to a registry'
 complete -c docker -A -f -n '__fish_seen_subcommand_from push' -l help -d 'Print usage'
 complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print_docker_images)' -d "Image"
 complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print_docker_repositories)' -d "Repository"
diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker
index 4a258d7869..5cb131523e 100644
--- a/contrib/completion/zsh/_docker
+++ b/contrib/completion/zsh/_docker
@@ -974,8 +974,8 @@ __docker_image_commands() {
         "load:Load an image from a tar archive or STDIN"
         "ls:List images"
         "prune:Remove unused images"
-        "pull:Pull an image or a repository from a registry"
-        "push:Push an image or a repository to a registry"
+        "pull:Download an image from a registry"
+        "push:Upload an image to a registry"
         "rm:Remove one or more images"
         "save:Save one or more images to a tar archive (streamed to STDOUT by default)"
         "tag:Tag an image into a repository"
diff --git a/docs/reference/commandline/image.md b/docs/reference/commandline/image.md
index 4ca4e9e18b..4fbb782163 100644
--- a/docs/reference/commandline/image.md
+++ b/docs/reference/commandline/image.md
@@ -23,8 +23,8 @@ Commands:
   load        Load an image from a tar archive or STDIN
   ls          List images
   prune       Remove unused images
-  pull        Pull an image or a repository from a registry
-  push        Push an image or a repository to a registry
+  pull        Download an image from a registry
+  push        Upload an image to a registry
   rm          Remove one or more images
   save        Save one or more images to a tar archive (streamed to STDOUT by default)
   tag         Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE
diff --git a/docs/reference/commandline/index.md b/docs/reference/commandline/index.md
index 740126ad70..cc0c73d9d4 100644
--- a/docs/reference/commandline/index.md
+++ b/docs/reference/commandline/index.md
@@ -78,8 +78,8 @@ read the [`dockerd`](dockerd.md) reference page.
 |:--------------------|:------------------------------------------------------------------------|
 | [login](login.md)   | Register or log in to a Docker registry                                 |
 | [logout](logout.md) | Log out from a Docker registry                                          |
-| [pull](pull.md)     | Pull an image or a repository from a Docker registry                    |
-| [push](push.md)     | Push an image or a repository to a Docker registry                      |
+| [pull](pull.md)     | Download an image from a registry                                       |
+| [push](push.md)     | Upload an image to a registry                                           |
 | [search](search.md) | Search Docker Hub for images                                            |
 
 ### Network and connectivity commands
diff --git a/docs/reference/commandline/pull.md b/docs/reference/commandline/pull.md
index faa90ab681..874e05dfbf 100644
--- a/docs/reference/commandline/pull.md
+++ b/docs/reference/commandline/pull.md
@@ -9,7 +9,7 @@ keywords: "pull, image, hub, docker"
 ```markdown
 Usage:  docker pull [OPTIONS] NAME[:TAG|@DIGEST]
 
-Pull an image or a repository from a registry
+Download an image from a registry
 
 Options:
   -a, --all-tags                Download all tagged images in the repository
diff --git a/docs/reference/commandline/push.md b/docs/reference/commandline/push.md
index f6ac39f844..5cbb704e18 100644
--- a/docs/reference/commandline/push.md
+++ b/docs/reference/commandline/push.md
@@ -9,7 +9,7 @@ keywords: "share, push, image"
 ```markdown
 Usage:  docker push [OPTIONS] NAME[:TAG]
 
-Push an image or a repository to a registry
+Upload an image to a registry
 
 Options:
   -a, --all-tags                Push all tags of an image to the repository