diff --git a/daemon/volumes_unix.go b/daemon/volumes_unix.go
index b860aa30f26370cc5f3e900745b82adfc6eab6d6..3b32c65f9a1687b8079bcc523ef326c4cdff9918 100644
--- a/daemon/volumes_unix.go
+++ b/daemon/volumes_unix.go
@@ -28,7 +28,7 @@ func copyOwnership(source, destination string) error {
 		return err
 	}
 
-	if err := os.Chown(destination, int(stat.UID()), int(stat.Gid())); err != nil {
+	if err := os.Chown(destination, int(stat.UID()), int(stat.GID())); err != nil {
 		return err
 	}
 
diff --git a/integration-cli/docker_cli_experimental_test.go b/integration-cli/docker_cli_experimental_test.go
index e0ed4c76cce5a2294ea690a5040405f83cf74ad5..8cbb1bb3ff9a31648a820812bfd08d5485f025f4 100644
--- a/integration-cli/docker_cli_experimental_test.go
+++ b/integration-cli/docker_cli_experimental_test.go
@@ -80,5 +80,5 @@ func (s *DockerDaemonSuite) TestDaemonUserNamespaceRootSetting(c *check.C) {
 		c.Fatal(err)
 	}
 	c.Assert(stat.UID(), check.Equals, uint32(uid), check.Commentf("Touched file not owned by remapped root UID"))
-	c.Assert(stat.Gid(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
+	c.Assert(stat.GID(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
 }
diff --git a/pkg/archive/changes_unix.go b/pkg/archive/changes_unix.go
index a2ccbb258377cdbf343bab66daa8733ecdf3f34f..05f109afac58766000422336480ffa3fe4553b4f 100644
--- a/pkg/archive/changes_unix.go
+++ b/pkg/archive/changes_unix.go
@@ -12,7 +12,7 @@ func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {
 	// Don't look at size for dirs, its not a good measure of change
 	if oldStat.Mode() != newStat.Mode() ||
 		oldStat.UID() != newStat.UID() ||
-		oldStat.Gid() != newStat.Gid() ||
+		oldStat.GID() != newStat.GID() ||
 		oldStat.Rdev() != newStat.Rdev() ||
 		// Don't look at size for dirs, its not a good measure of change
 		(oldStat.Mode()&syscall.S_IFDIR != syscall.S_IFDIR &&
diff --git a/pkg/system/stat.go b/pkg/system/stat.go
index 7392c8202929653fe70fc8cae8ea0e4545db59c4..087034c5ec55e1723c737dcd5197c9949252d8f3 100644
--- a/pkg/system/stat.go
+++ b/pkg/system/stat.go
@@ -27,8 +27,8 @@ func (s StatT) UID() uint32 {
 	return s.uid
 }
 
-// Gid returns file's group id of owner.
-func (s StatT) Gid() uint32 {
+// GID returns file's group id of owner.
+func (s StatT) GID() uint32 {
 	return s.gid
 }
 
diff --git a/pkg/system/stat_unix_test.go b/pkg/system/stat_unix_test.go
index 8b3c42b7334a46ae315fd02f34a8c200d963aebe..dee8d30a199dd4b5d33dc61a709f6aaa328e4ce1 100644
--- a/pkg/system/stat_unix_test.go
+++ b/pkg/system/stat_unix_test.go
@@ -27,7 +27,7 @@ func TestFromStatT(t *testing.T) {
 	if stat.Uid != s.UID() {
 		t.Fatal("got invalid uid")
 	}
-	if stat.Gid != s.Gid() {
+	if stat.Gid != s.GID() {
 		t.Fatal("got invalid gid")
 	}
 	if stat.Rdev != s.Rdev() {