diff --git a/api/client/commands.go b/api/client/commands.go
index 4f6f71d6d0..c930885bb9 100644
--- a/api/client/commands.go
+++ b/api/client/commands.go
@@ -505,8 +505,8 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
 	if remoteInfo.Exists("MemTotal") {
 		fmt.Fprintf(cli.out, "Total Memory: %s\n", units.BytesSize(float64(remoteInfo.GetInt64("MemTotal"))))
 	}
-	if remoteInfo.Exists("Hostname") {
-		fmt.Fprintf(cli.out, "Hostname: %s\n", remoteInfo.Get("Hostname"))
+	if remoteInfo.Exists("Name") {
+		fmt.Fprintf(cli.out, "Name: %s\n", remoteInfo.Get("Name"))
 	}
 	if remoteInfo.Exists("ID") {
 		fmt.Fprintf(cli.out, "ID: %s\n", remoteInfo.Get("ID"))
diff --git a/daemon/info.go b/daemon/info.go
index c05c2a569d..bb7f450698 100644
--- a/daemon/info.go
+++ b/daemon/info.go
@@ -77,7 +77,7 @@ func (daemon *Daemon) CmdInfo(job *engine.Job) engine.Status {
 	v.SetInt("NCPU", runtime.NumCPU())
 	v.SetInt64("MemTotal", meminfo.MemTotal)
 	if hostname, err := os.Hostname(); err == nil {
-		v.Set("Hostname", hostname)
+		v.Set("Name", hostname)
 	}
 	if _, err := v.WriteTo(job.Stdout); err != nil {
 		return job.Error(err)
diff --git a/docs/sources/reference/api/docker_remote_api.md b/docs/sources/reference/api/docker_remote_api.md
index 046e953b37..898cb571ea 100644
--- a/docs/sources/reference/api/docker_remote_api.md
+++ b/docs/sources/reference/api/docker_remote_api.md
@@ -50,8 +50,7 @@ You can still call an old version of the API using
 
 **New!**
 `info` now returns the number of CPUs available on the machine (`NCPU`),
-total memory available (`MemTotal`), the short hostname (`Hostname`). and
-the ID (`ID`).
+total memory available (`MemTotal`), a name (`Name`), and the ID (`ID`).
 
 `POST /containers/create`
 
diff --git a/docs/sources/reference/api/docker_remote_api_v1.16.md b/docs/sources/reference/api/docker_remote_api_v1.16.md
index 5e78e02ffb..03c28820d4 100644
--- a/docs/sources/reference/api/docker_remote_api_v1.16.md
+++ b/docs/sources/reference/api/docker_remote_api_v1.16.md
@@ -1220,7 +1220,7 @@ Display system-wide information
              "KernelVersion":"3.12.0-1-amd64"
              "NCPU":1,
              "MemTotal":2099236864,
-             "Hostname":"prod-server-42",
+             "Name":"prod-server-42",
              "ID":"7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS"
              "Debug":false,
              "NFd": 11,
diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md
index 24271a2c6e..2cc47b8bba 100644
--- a/docs/sources/reference/commandline/cli.md
+++ b/docs/sources/reference/commandline/cli.md
@@ -856,7 +856,7 @@ For example:
     Kernel Version: 3.13.0-24-generic
     Operating System: Ubuntu 14.04 LTS
     CPUs: 1
-    Hostname: prod-server-42
+    Name: prod-server-42
     ID: 7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS
     Total Memory: 2 GiB
     Debug mode (server): false