diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index fb297c044c..beb995ed93 100644
--- a/cmd/podman/common/create_opts.go
+++ b/cmd/podman/common/create_opts.go
@@ -69,7 +69,7 @@ func LogDriver() string {
 	return ""
 }
 
-// DefineCreateDefault is used to initialize ctr create options before flag initialization
+// DefineCreateDefaults is used to initialize ctr create options before flag initialization
 func DefineCreateDefaults(opts *entities.ContainerCreateOptions) {
 	opts.LogDriver = LogDriver()
 	opts.CgroupsMode = cgroupConfig()
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index 6392868154..0d5a65b0a0 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -340,7 +340,7 @@ func (l psReporter) ImageID() string {
 	return l.ListContainer.ImageID
 }
 
-// Labels returns a map of the pod's labels
+// Label returns a map of the pod's labels
 func (l psReporter) Label(name string) string {
 	return l.ListContainer.Labels[name]
 }
diff --git a/cmd/podman/parse/net.go b/cmd/podman/parse/net.go
index a19c00b06f..14c954f9e6 100644
--- a/cmd/podman/parse/net.go
+++ b/cmd/podman/parse/net.go
@@ -28,7 +28,7 @@ var (
 	domainRegexp = regexp.Delayed(`^(:?(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]))(:?\.(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])))*)\.?\s*$`)
 )
 
-// validateExtraHost validates that the specified string is a valid extrahost and returns it.
+// ValidateExtraHost validates that the specified string is a valid extrahost and returns it.
 // ExtraHost is in the form of name1;name2;name3:ip where the ip has to be a valid ip (ipv4 or ipv6) or the special string HostGateway.
 // for add-host flag
 func ValidateExtraHost(val string) (string, error) {
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 05b1b869ec..a4f9f002aa 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -136,7 +136,7 @@ func (c *Container) CheckpointPath() string {
 	return filepath.Join(c.bundlePath(), metadata.CheckpointDirectory)
 }
 
-// PreCheckpointPath returns the path to the directory containing the pre-checkpoint-images
+// PreCheckPointPath returns the path to the directory containing the pre-checkpoint-images
 func (c *Container) PreCheckPointPath() string {
 	return filepath.Join(c.bundlePath(), preCheckpointDir)
 }