diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index bf82cf9de5..fa849aa4cc 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -446,7 +446,7 @@ func (l psReporter) CreatedAt() string {
 	return l.Created.String()
 }
 
-// CreateHuman allows us to output the created time in human readable format
+// CreatedHuman allows us to output the created time in human readable format
 func (l psReporter) CreatedHuman() string {
 	return units.HumanDuration(time.Since(l.Created)) + " ago"
 }
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index 44428df087..970192c79e 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -1469,7 +1469,7 @@ func (s *BoltState) GetContainerExitCodeTimeStamp(id string) (*time.Time, error)
 	})
 }
 
-// PruneExitCodes removes exit codes older than 5 minutes unless the associated
+// PruneContainerExitCodes removes exit codes older than 5 minutes unless the associated
 // container still exists.
 func (s *BoltState) PruneContainerExitCodes() error {
 	if !s.valid {
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 1b30292346..fc8526b61a 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -2482,7 +2482,7 @@ func (c *Container) hasNamespace(namespace spec.LinuxNamespaceType) bool {
 	return false
 }
 
-// extractSecretToStorage copies a secret's data from the secrets manager to the container's static dir
+// extractSecretToCtrStorage copies a secret's data from the secrets manager to the container's static dir
 func (c *Container) extractSecretToCtrStorage(secr *ContainerSecret) error {
 	manager, err := c.runtime.SecretsManager()
 	if err != nil {
diff --git a/libpod/container_path_resolution.go b/libpod/container_path_resolution.go
index 682aa93284..068cd284ea 100644
--- a/libpod/container_path_resolution.go
+++ b/libpod/container_path_resolution.go
@@ -26,7 +26,7 @@ func (c *Container) pathAbs(path string) string {
 	return path
 }
 
-// resolveContainerPaths resolves the container's mount point and the container
+// resolvePath resolves the container's mount point and the container
 // path as specified by the user.  Both may resolve to paths outside of the
 // container's mount point when the container path hits a volume or bind mount.
 //
@@ -153,7 +153,7 @@ func isPathOnVolume(c *Container, containerPath string) bool {
 	return false
 }
 
-// findBindMounts checks if the specified containerPath matches the destination
+// findBindMount checks if the specified containerPath matches the destination
 // path of a Mount.  Returns a matching Mount or nil.
 func findBindMount(c *Container, containerPath string) *specs.Mount {
 	cleanedPath := filepath.Clean(containerPath)