diff --git a/pkg/backup/backup_test.go b/pkg/backup/backup_test.go
index 0a8c7db78..6be7c9422 100644
--- a/pkg/backup/backup_test.go
+++ b/pkg/backup/backup_test.go
@@ -164,7 +164,7 @@ func TestBackupProgressIsUpdated(t *testing.T) {
 	assert.Len(t, req.BackedUpItems, req.Status.Progress.ItemsBackedUp)
 }
 
-// TestBackupResourceFiltering runs backups with different combinations
+// TestBackupOldResourceFiltering runs backups with different combinations
 // of resource filters (included/excluded resources, included/excluded
 // namespaces, label selectors, "include cluster resources" flag), and
 // verifies that the set of items written to the backup tarball are
@@ -1430,7 +1430,7 @@ func TestBackupItemActionsForSkippedPV(t *testing.T) {
 	}
 }
 
-// TestBackupActionsRunsForCorrectItems runs backups with backup item actions, and
+// TestBackupActionsRunForCorrectItems runs backups with backup item actions, and
 // verifies that each backup item action is run for the correct set of resources based on its
 // AppliesTo() resource selector. Verification is done by using the recordResourcesAction struct,
 // which records which resources it's executed for.
diff --git a/pkg/builder/v1_customresourcedefinition_builder.go b/pkg/builder/v1_customresourcedefinition_builder.go
index 4bb20590a..1962bf309 100644
--- a/pkg/builder/v1_customresourcedefinition_builder.go
+++ b/pkg/builder/v1_customresourcedefinition_builder.go
@@ -78,7 +78,7 @@ type V1CustomResourceDefinitionConditionBuilder struct {
 	object apiextv1.CustomResourceDefinitionCondition
 }
 
-// ForV1V1CustomResourceDefinitionConditionBuilder is the constructor for a V1CustomResourceDefinitionConditionBuilder.
+// ForV1CustomResourceDefinitionCondition is the constructor for a V1CustomResourceDefinitionConditionBuilder.
 func ForV1CustomResourceDefinitionCondition() *V1CustomResourceDefinitionConditionBuilder {
 	return &V1CustomResourceDefinitionConditionBuilder{
 		object: apiextv1.CustomResourceDefinitionCondition{},
diff --git a/pkg/cmd/util/output/backup_structured_describer.go b/pkg/cmd/util/output/backup_structured_describer.go
index 751991356..20d6371c0 100644
--- a/pkg/cmd/util/output/backup_structured_describer.go
+++ b/pkg/cmd/util/output/backup_structured_describer.go
@@ -410,7 +410,7 @@ func describeCSISnapshotInSF(details bool, info *volume.VolumeInfo, snapshotDeta
 	snapshotDetails[fmt.Sprintf("%s/%s", info.PVCNamespace, info.PVCName)] = snapshotDetail
 }
 
-// describeVSCInSF describes CSI volume snapshot contents in structured format.
+// describeLocalSnapshotInSF describes CSI volume snapshot contents in structured format.
 func describeLocalSnapshotInSF(details bool, info *volume.VolumeInfo, snapshotDetail map[string]interface{}) {
 	if !info.PreserveLocalSnapshot {
 		return
diff --git a/pkg/restore/actions/change_image_name_action_test.go b/pkg/restore/actions/change_image_name_action_test.go
index d851e7c0d..37130006a 100644
--- a/pkg/restore/actions/change_image_name_action_test.go
+++ b/pkg/restore/actions/change_image_name_action_test.go
@@ -33,7 +33,7 @@ import (
 	"github.com/vmware-tanzu/velero/pkg/plugin/velero"
 )
 
-// TestChangeImageNameActionExecute runs the ChangeImageNameAction's Execute
+// TestChangeImageRepositoryActionExecute runs the ChangeImageNameAction's Execute
 // method and validates that the item's image name is modified (or not) as expected.
 // Validation is done by comparing the result of the Execute method to the test case's
 // desired result.
diff --git a/pkg/restore/restore_test.go b/pkg/restore/restore_test.go
index dd9138237..f098537e2 100644
--- a/pkg/restore/restore_test.go
+++ b/pkg/restore/restore_test.go
@@ -1491,7 +1491,7 @@ func (a *recordResourcesAction) WithAdditionalItems(items []velero.ResourceIdent
 	return a
 }
 
-// TestRestoreActionsRunsForCorrectItems runs restores with restore item actions, and
+// TestRestoreActionsRunForCorrectItems runs restores with restore item actions, and
 // verifies that each restore item action is run for the correct set of resources based on its
 // AppliesTo() resource selector. Verification is done by using the recordResourcesAction struct,
 // which records which resources it's executed for.
diff --git a/pkg/test/fake_credential_file_store.go b/pkg/test/fake_credential_file_store.go
index 1534a7115..af6618521 100644
--- a/pkg/test/fake_credential_file_store.go
+++ b/pkg/test/fake_credential_file_store.go
@@ -39,7 +39,7 @@ func (f *fakeCredentialsFileStore) Path(*corev1api.SecretKeySelector) (string, e
 	return f.path, f.err
 }
 
-// NewFakeCredentialFileStore creates a FileStore which will return the given path
+// NewFakeCredentialsFileStore creates a FileStore which will return the given path
 // and error when Path is called.
 func NewFakeCredentialsFileStore(path string, err error) FileStore {
 	return &fakeCredentialsFileStore{
diff --git a/pkg/uploader/kopia/shim.go b/pkg/uploader/kopia/shim.go
index b2e5e942c..b90837d19 100644
--- a/pkg/uploader/kopia/shim.go
+++ b/pkg/uploader/kopia/shim.go
@@ -95,7 +95,7 @@ func (sr *shimRepository) FindManifests(ctx context.Context, labels map[string]s
 	return GetKopiaManifestEntries(metadata), nil
 }
 
-// GetKopiaManifestEntries get metadata from specific ManifestEntryMetadata
+// GetKopiaManifestEntry get metadata from specific ManifestEntryMetadata
 func GetKopiaManifestEntry(uMani *udmrepo.ManifestEntryMetadata) *manifest.EntryMetadata {
 	var ret manifest.EntryMetadata