diff --git a/internal/plugin/admission/certificaterequest/approval/certificaterequest_approval.go b/internal/plugin/admission/certificaterequest/approval/certificaterequest_approval.go
index 4f72bc4ea..ae83fda3e 100644
--- a/internal/plugin/admission/certificaterequest/approval/certificaterequest_approval.go
+++ b/internal/plugin/admission/certificaterequest/approval/certificaterequest_approval.go
@@ -204,7 +204,7 @@ func (c *certificateRequestApproval) cacheAPIResource(groupKind schema.GroupKind
 
 var errNoResourceExists = fmt.Errorf("no resource registered")
 
-// signerNameForAPIResource returns the computed signerName for a given API resource
+// signerNamesForAPIResource returns the computed signerName for a given API resource
 // referenced by a CertificateRequest in a namespace.
 func signerNamesForAPIResource(name, namespace string, info resourceInfo) []string {
 	signerNames := make([]string, 0, 2)
diff --git a/pkg/controller/cainjector/indexers.go b/pkg/controller/cainjector/indexers.go
index a86e5dafc..4c6a6f41c 100644
--- a/pkg/controller/cainjector/indexers.go
+++ b/pkg/controller/cainjector/indexers.go
@@ -89,7 +89,7 @@ func certFromSecretToInjectableMapFuncBuilder(cl client.Reader, log logr.Logger,
 	}
 }
 
-// certFromSecretToInjectableMapFuncBuilder returns a handler.MapFunc that, for
+// certToInjectableMapFuncBuilder returns a handler.MapFunc that, for
 // a Certificate change, ensures that if this Certificate that is configured as
 // a CA source for an injectable via inject-ca-from annotation, a reconcile loop
 // will be triggered for this injectable
diff --git a/pkg/controller/util.go b/pkg/controller/util.go
index faf511e0b..c510f77e1 100644
--- a/pkg/controller/util.go
+++ b/pkg/controller/util.go
@@ -170,7 +170,7 @@ func (b *BlockingEventHandler) OnDelete(obj interface{}) {
 	b.WorkFunc(obj)
 }
 
-// BuildAnnotationsCopy takes a map of annotations and a list of prefix
+// BuildAnnotationsToCopy takes a map of annotations and a list of prefix
 // filters and builds a filtered map of annotations. It is used to filter
 // annotations to be copied from Certificate to CertificateRequest and from
 // CertificateSigningRequest to Order.
diff --git a/pkg/util/pki/certificatetemplate.go b/pkg/util/pki/certificatetemplate.go
index b5277aef9..f043d8a8d 100644
--- a/pkg/util/pki/certificatetemplate.go
+++ b/pkg/util/pki/certificatetemplate.go
@@ -207,7 +207,7 @@ func CertificateTemplateFromCertificateRequest(cr *v1.CertificateRequest) (*x509
 	)
 }
 
-// CertificateTemplateFromCertificateRequest will create a x509.Certificate for the given
+// CertificateTemplateFromCertificateSigningRequest will create a x509.Certificate for the given
 // CertificateSigningRequest resource
 func CertificateTemplateFromCertificateSigningRequest(csr *certificatesv1.CertificateSigningRequest) (*x509.Certificate, error) {
 	duration, err := DurationFromCertificateSigningRequest(csr)
diff --git a/pkg/util/predicate/certificate.go b/pkg/util/predicate/certificate.go
index 4f8a10da3..b93f07bdc 100644
--- a/pkg/util/predicate/certificate.go
+++ b/pkg/util/predicate/certificate.go
@@ -31,7 +31,7 @@ func CertificateSecretName(name string) Func {
 	}
 }
 
-// CertificateSecretName returns a predicate that used to filter Certificates
+// CertificateNextPrivateKeySecretName returns a predicate that used to filter Certificates
 // to only those with the given 'status.nextPrivateKeySecretName'.
 // It is not possible to select Certificates with a 'nil' secret name using
 // this predicate function.