diff --git a/pkg/controller/controller_ref_manager.go b/pkg/controller/controller_ref_manager.go
index a5af692d35f5..8b043b843715 100644
--- a/pkg/controller/controller_ref_manager.go
+++ b/pkg/controller/controller_ref_manager.go
@@ -279,7 +279,7 @@ func (m *VirtualMachineControllerRefManager) ClaimVirtualMachineInstances(vmis [
 	return claimed, utilerrors.NewAggregate(errlist)
 }
 
-// ReleaseDetachVirtualMachines removes ownership of detached VMs.
+// ReleaseDetachedVirtualMachines removes ownership of detached VMs.
 //
 // It will reconcile the following:
 //   - Release owned objects if the selector no longer matches.
diff --git a/pkg/util/util.go b/pkg/util/util.go
index 8e431269c382..4b153be436eb 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -276,7 +276,7 @@ func CalcExpectedMemoryDumpSize(vmi *v1.VirtualMachineInstance) *resource.Quanti
 	return expectedPvcSize
 }
 
-// GenerateRandomString creates a securely generated random string using crypto/rand
+// GenerateSecureRandomString creates a securely generated random string using crypto/rand
 func GenerateSecureRandomString(n int) (string, error) {
 	ret := make([]byte, n)
 	for i := range ret {
diff --git a/pkg/virt-api/webhooks/validating-webhook/admitters/vmclone-admitter.go b/pkg/virt-api/webhooks/validating-webhook/admitters/vmclone-admitter.go
index 02b85e099725..3ab8930d36bc 100644
--- a/pkg/virt-api/webhooks/validating-webhook/admitters/vmclone-admitter.go
+++ b/pkg/virt-api/webhooks/validating-webhook/admitters/vmclone-admitter.go
@@ -54,7 +54,7 @@ type VirtualMachineCloneAdmitter struct {
 	Client kubecli.KubevirtClient
 }
 
-// NewMigrationPolicyAdmitter creates a MigrationPolicyAdmitter
+// NewVMCloneAdmitter creates a VM Clone Admitter
 func NewVMCloneAdmitter(config *virtconfig.ClusterConfig, client kubecli.KubevirtClient) *VirtualMachineCloneAdmitter {
 	return &VirtualMachineCloneAdmitter{
 		Config: config,