diff --git a/libpod/options.go b/libpod/options.go
index f4f03f341c..3aa2007edb 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -557,7 +557,7 @@ func WithShmDir(dir string) CtrCreateOption {
 	}
 }
 
-// WithNOShmMount tells libpod whether to mount /dev/shm
+// WithNoShm tells libpod whether to mount /dev/shm
 func WithNoShm(mount bool) CtrCreateOption {
 	return func(ctr *Container) error {
 		if ctr.valid {
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index db70c4c108..585e1f0217 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -105,7 +105,7 @@ func (r *Runtime) IsExternalContainerCallback(_ context.Context) libimage.IsExte
 	}
 }
 
-// newBuildEvent creates a new event based on completion of a built image
+// newImageBuildCompleteEvent creates a new event based on completion of a built image
 func (r *Runtime) newImageBuildCompleteEvent(idOrName string) {
 	e := events.NewEvent(events.Build)
 	e.Type = events.Image
diff --git a/libpod/sqlite_state.go b/libpod/sqlite_state.go
index 9a9f793e86..b54e33f49c 100644
--- a/libpod/sqlite_state.go
+++ b/libpod/sqlite_state.go
@@ -996,7 +996,7 @@ func (s *SQLiteState) GetContainerExitCodeTimeStamp(id string) (*time.Time, erro
 	return &result, nil
 }
 
-// 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 *SQLiteState) PruneContainerExitCodes() (defErr error) {
 	if !s.valid {
diff --git a/pkg/checkpoint/crutils/checkpoint_restore_utils.go b/pkg/checkpoint/crutils/checkpoint_restore_utils.go
index 07f3b769ff..3736ea1e2e 100644
--- a/pkg/checkpoint/crutils/checkpoint_restore_utils.go
+++ b/pkg/checkpoint/crutils/checkpoint_restore_utils.go
@@ -222,7 +222,7 @@ func CRRuntimeSupportsCheckpointRestore(runtimePath string) bool {
 	return false
 }
 
-// CRRuntimeSupportsCheckpointRestore tests if the runtime at 'runtimePath'
+// CRRuntimeSupportsPodCheckpointRestore tests if the runtime at 'runtimePath'
 // supports restoring into existing Pods. The runtime needs to support
 // the CRIU option --lsm-mount-context and the existence of this is checked
 // by this function. In addition it is necessary to at least have CRIU 3.16.
diff --git a/pkg/farm/list_builder.go b/pkg/farm/list_builder.go
index 8ac81ea29c..d8fce5e32f 100644
--- a/pkg/farm/list_builder.go
+++ b/pkg/farm/list_builder.go
@@ -26,7 +26,7 @@ type listLocal struct {
 	options     listBuilderOptions
 }
 
-// newLocalManifestListBuilder returns a manifest list builder which saves a
+// newManifestListBuilder returns a manifest list builder which saves a
 // manifest list and images to local storage.
 func newManifestListBuilder(listName string, localEngine entities.ImageEngine, options listBuilderOptions) *listLocal {
 	return &listLocal{