diff --git a/internal/concierge/server/prepare_controllers.go b/internal/concierge/server/prepare_controllers.go
index 5b5c9cf02..9cda1929d 100644
--- a/internal/concierge/server/prepare_controllers.go
+++ b/internal/concierge/server/prepare_controllers.go
@@ -146,7 +146,7 @@ func PrepareControllers(c *Config) (controllerinit.RunnerBuilder, error) { //nol
 
 		// API certs controllers are responsible for managing the TLS certificates used to serve Pinniped's API.
 		WithController(
-			apicerts.NewCertsManagerController(
+			apicerts.NewCertsCreatorController(
 				c.ServerInstallationInfo.Namespace,
 				c.NamesConfig.ServingCertificateSecret,
 				c.Labels,
@@ -300,7 +300,7 @@ func PrepareControllers(c *Config) (controllerinit.RunnerBuilder, error) { //nol
 			singletonWorker,
 		).
 		WithController(
-			apicerts.NewCertsManagerController(
+			apicerts.NewCertsCreatorController(
 				c.ServerInstallationInfo.Namespace,
 				c.NamesConfig.ImpersonationSignerSecret,
 				c.Labels,
diff --git a/internal/controller/apicerts/certs_manager.go b/internal/controller/apicerts/certs_creator.go
similarity index 95%
rename from internal/controller/apicerts/certs_manager.go
rename to internal/controller/apicerts/certs_creator.go
index e462794e4..8df8837e5 100644
--- a/internal/controller/apicerts/certs_manager.go
+++ b/internal/controller/apicerts/certs_creator.go
@@ -26,7 +26,7 @@ const (
 	TLSCertificateChainSecretKey     = "tlsCertificateChain"
 )
 
-type certsManagerController struct {
+type certsCreatorController struct {
 	namespace               string
 	certsSecretResourceName string
 	certsSecretLabels       map[string]string
@@ -41,7 +41,7 @@ type certsManagerController struct {
 	serviceNameForGeneratedCertCommonName string
 }
 
-func NewCertsManagerController(
+func NewCertsCreatorController(
 	namespace string,
 	certsSecretResourceName string,
 	certsSecretLabels map[string]string,
@@ -56,7 +56,7 @@ func NewCertsManagerController(
 	return controllerlib.New(
 		controllerlib.Config{
 			Name: "certs-manager-controller",
-			Syncer: &certsManagerController{
+			Syncer: &certsCreatorController{
 				namespace:                             namespace,
 				certsSecretResourceName:               certsSecretResourceName,
 				certsSecretLabels:                     certsSecretLabels,
@@ -80,7 +80,7 @@ func NewCertsManagerController(
 	)
 }
 
-func (c *certsManagerController) Sync(ctx controllerlib.Context) error {
+func (c *certsCreatorController) Sync(ctx controllerlib.Context) error {
 	// Try to get the secret from the informer cache.
 	_, err := c.secretInformer.Lister().Secrets(c.namespace).Get(c.certsSecretResourceName)
 	notFound := apierrors.IsNotFound(err)
@@ -140,6 +140,6 @@ func (c *certsManagerController) Sync(ctx controllerlib.Context) error {
 		return fmt.Errorf("could not create secret: %w", err)
 	}
 
-	plog.Info("certsManagerController Sync successfully created secret")
+	plog.Info("certsCreatorController Sync successfully created secret")
 	return nil
 }
diff --git a/internal/controller/apicerts/certs_manager_test.go b/internal/controller/apicerts/certs_creator_test.go
similarity index 99%
rename from internal/controller/apicerts/certs_manager_test.go
rename to internal/controller/apicerts/certs_creator_test.go
index e51c618f3..aacdaf41d 100644
--- a/internal/controller/apicerts/certs_manager_test.go
+++ b/internal/controller/apicerts/certs_creator_test.go
@@ -39,7 +39,7 @@ func TestManagerControllerOptions(t *testing.T) {
 			observableWithInformerOption = testutil.NewObservableWithInformerOption()
 			observableWithInitialEventOption = testutil.NewObservableWithInitialEventOption()
 			secretsInformer := k8sinformers.NewSharedInformerFactory(nil, 0).Core().V1().Secrets()
-			_ = NewCertsManagerController(
+			_ = NewCertsCreatorController(
 				installedInNamespace,
 				certsSecretResourceName,
 				make(map[string]string),
@@ -134,7 +134,7 @@ func TestManagerControllerSync(t *testing.T) {
 		// nested Before's can keep adding things to the informer caches.
 		var startInformersAndController = func(serviceName string) {
 			// Set this at the last second to allow for injection of server override.
-			subject = NewCertsManagerController(
+			subject = NewCertsCreatorController(
 				installedInNamespace,
 				certsSecretResourceName,
 				map[string]string{
diff --git a/internal/localuserauthenticator/localuserauthenticator.go b/internal/localuserauthenticator/localuserauthenticator.go
index 33ee42b25..0840d3f93 100644
--- a/internal/localuserauthenticator/localuserauthenticator.go
+++ b/internal/localuserauthenticator/localuserauthenticator.go
@@ -293,7 +293,7 @@ func startControllers(
 	controllerManager := controllerlib.
 		NewManager().
 		WithController(
-			apicerts.NewCertsManagerController(
+			apicerts.NewCertsCreatorController(
 				namespace,
 				certsSecretResourceName,
 				map[string]string{
diff --git a/internal/supervisor/server/server.go b/internal/supervisor/server/server.go
index a87160486..e0e87499d 100644
--- a/internal/supervisor/server/server.go
+++ b/internal/supervisor/server/server.go
@@ -349,7 +349,7 @@ func prepareControllers(
 			),
 			singletonWorker).
 		WithController(
-			apicerts.NewCertsManagerController(
+			apicerts.NewCertsCreatorController(
 				podInfo.Namespace,
 				certificateName,
 				cfg.Labels,