diff --git a/src/cmd/linuxkit/pkg_build.go b/src/cmd/linuxkit/pkg_build.go
index 2ee53a490..6c8108b06 100644
--- a/src/cmd/linuxkit/pkg_build.go
+++ b/src/cmd/linuxkit/pkg_build.go
@@ -21,7 +21,7 @@ func pkgBuild(args []string) {
 
 	force := flags.Bool("force", false, "Force rebuild")
 
-	ps, err := pkglib.NewFromCLI(flags, args...)
+	p, err := pkglib.NewFromCLI(flags, args...)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
@@ -31,7 +31,7 @@ func pkgBuild(args []string) {
 	if *force {
 		opts = append(opts, pkglib.WithBuildForce())
 	}
-	if err := ps.Build(opts...); err != nil {
+	if err := p.Build(opts...); err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
diff --git a/src/cmd/linuxkit/pkg_push.go b/src/cmd/linuxkit/pkg_push.go
index b1f044da7..2dbcc17e5 100644
--- a/src/cmd/linuxkit/pkg_push.go
+++ b/src/cmd/linuxkit/pkg_push.go
@@ -21,7 +21,7 @@ func pkgPush(args []string) {
 
 	force := flags.Bool("force", false, "Force rebuild")
 
-	ps, err := pkglib.NewFromCLI(flags, args...)
+	p, err := pkglib.NewFromCLI(flags, args...)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
@@ -33,7 +33,7 @@ func pkgPush(args []string) {
 		opts = append(opts, pkglib.WithBuildForce())
 	}
 
-	if err := ps.Build(opts...); err != nil {
+	if err := p.Build(opts...); err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
diff --git a/src/cmd/linuxkit/pkg_showtag.go b/src/cmd/linuxkit/pkg_showtag.go
index a0a671cfe..58cdb814f 100644
--- a/src/cmd/linuxkit/pkg_showtag.go
+++ b/src/cmd/linuxkit/pkg_showtag.go
@@ -19,11 +19,11 @@ func pkgShowTag(args []string) {
 		flags.PrintDefaults()
 	}
 
-	ps, err := pkglib.NewFromCLI(flags, args...)
+	p, err := pkglib.NewFromCLI(flags, args...)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
 
-	fmt.Println(ps.Tag())
+	fmt.Println(p.Tag())
 }
diff --git a/src/cmd/linuxkit/pkglib/build.go b/src/cmd/linuxkit/pkglib/build.go
index 6f19d00e0..b919a8f0b 100644
--- a/src/cmd/linuxkit/pkglib/build.go
+++ b/src/cmd/linuxkit/pkglib/build.go
@@ -31,7 +31,7 @@ func WithBuildPush() BuildOpt {
 }
 
 // Build builds the package
-func (ps Pkg) Build(bos ...BuildOpt) error {
+func (p Pkg) Build(bos ...BuildOpt) error {
 	var bo buildOpts
 	for _, fn := range bos {
 		if err := fn(&bo); err != nil {
@@ -39,16 +39,16 @@ func (ps Pkg) Build(bos ...BuildOpt) error {
 		}
 	}
 
-	if _, ok := os.LookupEnv("DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE"); !ok && ps.trust && bo.push {
+	if _, ok := os.LookupEnv("DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE"); !ok && p.trust && bo.push {
 		return fmt.Errorf("Pushing with trust enabled requires $DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE to be set")
 	}
 
 	arch := runtime.GOARCH
 
-	if !ps.archSupported(arch) {
+	if !p.archSupported(arch) {
 		return fmt.Errorf("Arch %s not supported by this package", arch)
 	}
-	if err := ps.cleanForBuild(); err != nil {
+	if err := p.cleanForBuild(); err != nil {
 		return err
 	}
 
@@ -65,10 +65,10 @@ func (ps Pkg) Build(bos ...BuildOpt) error {
 		return err
 	}
 
-	d := newDockerRunner(ps.trust, ps.cache)
+	d := newDockerRunner(p.trust, p.cache)
 
 	if !bo.force {
-		ok, err := d.pull(ps.Tag() + suffix)
+		ok, err := d.pull(p.Tag() + suffix)
 		if err != nil {
 			return err
 		}
@@ -80,10 +80,10 @@ func (ps Pkg) Build(bos ...BuildOpt) error {
 
 	var args []string
 
-	if ps.gitRepo != "" {
-		args = append(args, "--label", "org.opencontainers.image.source="+ps.gitRepo)
+	if p.gitRepo != "" {
+		args = append(args, "--label", "org.opencontainers.image.source="+p.gitRepo)
 	}
-	if !ps.dirty {
+	if !p.dirty {
 		commit, err := gitCommitHash("HEAD")
 		if err != nil {
 			return err
@@ -91,11 +91,11 @@ func (ps Pkg) Build(bos ...BuildOpt) error {
 		args = append(args, "--label", "org.opencontainers.image.revision="+commit)
 	}
 
-	if !ps.network {
+	if !p.network {
 		args = append(args, "--network=none")
 	}
 
-	if err := d.build(ps.Tag()+suffix, ps.pkgPath, args...); err != nil {
+	if err := d.build(p.Tag()+suffix, p.pkgPath, args...); err != nil {
 		return err
 	}
 
@@ -104,7 +104,7 @@ func (ps Pkg) Build(bos ...BuildOpt) error {
 		return nil
 	}
 
-	if ps.dirty {
+	if p.dirty {
 		return fmt.Errorf("build complete, refusing to push dirty package")
 	}
 
@@ -114,7 +114,7 @@ func (ps Pkg) Build(bos ...BuildOpt) error {
 	// matters given we do either pull or build above in the
 	// !force case.
 
-	if err := d.pushWithManifest(ps.Tag(), suffix); err != nil {
+	if err := d.pushWithManifest(p.Tag(), suffix); err != nil {
 		return err
 	}
 
@@ -123,12 +123,12 @@ func (ps Pkg) Build(bos ...BuildOpt) error {
 		return nil
 	}
 
-	relTag, err := ps.ReleaseTag(release)
+	relTag, err := p.ReleaseTag(release)
 	if err != nil {
 		return err
 	}
 
-	if err := d.tag(ps.Tag()+suffix, relTag+suffix); err != nil {
+	if err := d.tag(p.Tag()+suffix, relTag+suffix); err != nil {
 		return err
 	}
 
diff --git a/src/cmd/linuxkit/pkglib/pkglib.go b/src/cmd/linuxkit/pkglib/pkglib.go
index be036891b..fad28fced 100644
--- a/src/cmd/linuxkit/pkglib/pkglib.go
+++ b/src/cmd/linuxkit/pkglib/pkglib.go
@@ -163,33 +163,33 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) {
 }
 
 // Hash returns the hash of the package
-func (ps Pkg) Hash() string {
-	return ps.hash
+func (p Pkg) Hash() string {
+	return p.hash
 }
 
 // ReleaseTag returns the tag to use for a particular release of the package
-func (ps Pkg) ReleaseTag(release string) (string, error) {
+func (p Pkg) ReleaseTag(release string) (string, error) {
 	if release == "" {
 		return "", fmt.Errorf("A release tag is required")
 	}
-	if ps.dirty {
+	if p.dirty {
 		return "", fmt.Errorf("Cannot release a dirty package")
 	}
-	tag := ps.org + "/" + ps.image + ":" + release
+	tag := p.org + "/" + p.image + ":" + release
 	return tag, nil
 }
 
 // Tag returns the tag to use for the package
-func (ps Pkg) Tag() string {
-	tag := ps.org + "/" + ps.image + ":" + ps.hash
-	if ps.dirty {
+func (p Pkg) Tag() string {
+	tag := p.org + "/" + p.image + ":" + p.hash
+	if p.dirty {
 		tag += "-dirty"
 	}
 	return tag
 }
 
-func (ps Pkg) archSupported(want string) bool {
-	for _, supp := range ps.arches {
+func (p Pkg) archSupported(want string) bool {
+	for _, supp := range p.arches {
 		if supp == want {
 			return true
 		}
@@ -197,8 +197,8 @@ func (ps Pkg) archSupported(want string) bool {
 	return false
 }
 
-func (ps Pkg) cleanForBuild() error {
-	if ps.commitHash != "HEAD" {
+func (p Pkg) cleanForBuild() error {
+	if p.commitHash != "HEAD" {
 		return fmt.Errorf("Cannot build from commit hash != HEAD")
 	}
 	return nil