diff --git a/pkg/netcertmanager/certificate.go b/pkg/netcertmanager/certificate.go
index 90f01b3f91f3..e98bc5afb03b 100644
--- a/pkg/netcertmanager/certificate.go
+++ b/pkg/netcertmanager/certificate.go
@@ -20,8 +20,6 @@ import (
 	"context"
 	"fmt"
 	"hash/adler32"
-	"knative.dev/serving/pkg/netcertmanager/config"
-	"knative.dev/serving/pkg/netcertmanager/resources"
 	"strconv"
 	"time"
 
@@ -48,6 +46,8 @@ import (
 	certmanagerclientset "knative.dev/serving/pkg/netcertmanager/client/certmanager/clientset/versioned"
 	acmelisters "knative.dev/serving/pkg/netcertmanager/client/certmanager/listers/acme/v1"
 	certmanagerlisters "knative.dev/serving/pkg/netcertmanager/client/certmanager/listers/certmanager/v1"
+	"knative.dev/serving/pkg/netcertmanager/config"
+	"knative.dev/serving/pkg/netcertmanager/resources"
 )
 
 const (
diff --git a/pkg/netcertmanager/certificate_test.go b/pkg/netcertmanager/certificate_test.go
index 0131b0c8cbd7..abf6b3bcaf57 100644
--- a/pkg/netcertmanager/certificate_test.go
+++ b/pkg/netcertmanager/certificate_test.go
@@ -21,12 +21,13 @@ import (
 	"errors"
 	"fmt"
 	"hash/adler32"
-	config2 "knative.dev/serving/pkg/netcertmanager/config"
-	"knative.dev/serving/pkg/netcertmanager/resources"
-	testing2 "knative.dev/serving/pkg/netcertmanager/testing"
 	"testing"
 	"time"
 
+	netcertmanageronfig "knative.dev/serving/pkg/netcertmanager/config"
+	"knative.dev/serving/pkg/netcertmanager/resources"
+	netcertmanagertesting "knative.dev/serving/pkg/netcertmanager/testing"
+
 	acmev1 "github.com/cert-manager/cert-manager/pkg/apis/acme/v1"
 	cmv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
@@ -111,7 +112,7 @@ func TestNewController(t *testing.T) {
 
 	configMapWatcher := configmap.NewStaticWatcher(&corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      config2.CertManagerConfigName,
+			Name:      netcertmanageronfig.CertManagerConfigName,
 			Namespace: system.Namespace(),
 		},
 		Data: map[string]string{
@@ -558,7 +559,7 @@ func TestReconcile(t *testing.T) {
 		}},
 	}}
 
-	table.Test(t, testing2.MakeFactory(func(ctx context.Context, listers *testing2.Listers, cmw configmap.Watcher) controller.Reconciler {
+	table.Test(t, netcertmanagertesting.MakeFactory(func(ctx context.Context, listers *netcertmanagertesting.Listers, cmw configmap.Watcher) controller.Reconciler {
 		retryAttempted = false
 		r := &Reconciler{
 			cmCertificateLister: listers.GetCMCertificateLister(),
@@ -572,7 +573,7 @@ func TestReconcile(t *testing.T) {
 			listers.GetCertificateLister(), controller.GetEventRecorder(ctx), r,
 			netcfg.CertManagerCertificateClassName, controller.Options{
 				ConfigStore: &testConfigStore{
-					config: &config2.Config{
+					config: &netcertmanageronfig.Config{
 						CertManager: certmanagerConfig(),
 					},
 				},
@@ -747,7 +748,7 @@ func TestReconcile_HTTP01Challenges(t *testing.T) {
 		},
 	}}
 
-	table.Test(t, testing2.MakeFactory(func(ctx context.Context, listers *testing2.Listers, cmw configmap.Watcher) controller.Reconciler {
+	table.Test(t, netcertmanagertesting.MakeFactory(func(ctx context.Context, listers *netcertmanagertesting.Listers, cmw configmap.Watcher) controller.Reconciler {
 		r := &Reconciler{
 			cmCertificateLister: listers.GetCMCertificateLister(),
 			cmChallengeLister:   listers.GetCMChallengeLister(),
@@ -760,7 +761,7 @@ func TestReconcile_HTTP01Challenges(t *testing.T) {
 			listers.GetCertificateLister(), controller.GetEventRecorder(ctx), r,
 			netcfg.CertManagerCertificateClassName, controller.Options{
 				ConfigStore: &testConfigStore{
-					config: &config2.Config{
+					config: &netcertmanageronfig.Config{
 						CertManager: certmanagerConfig(),
 					},
 				},
@@ -769,17 +770,17 @@ func TestReconcile_HTTP01Challenges(t *testing.T) {
 }
 
 type testConfigStore struct {
-	config *config2.Config
+	config *netcertmanageronfig.Config
 }
 
 func (t *testConfigStore) ToContext(ctx context.Context) context.Context {
-	return config2.ToContext(ctx, t.config)
+	return netcertmanageronfig.ToContext(ctx, t.config)
 }
 
 var _ pkgreconciler.ConfigStore = (*testConfigStore)(nil)
 
-func certmanagerConfig() *config2.CertManagerConfig {
-	return &config2.CertManagerConfig{
+func certmanagerConfig() *netcertmanageronfig.CertManagerConfig {
+	return &netcertmanageronfig.CertManagerConfig{
 		IssuerRef: &cmmeta.ObjectReference{
 			Kind: "ClusterIssuer",
 			Name: "Letsencrypt-issuer",
diff --git a/pkg/netcertmanager/controller.go b/pkg/netcertmanager/controller.go
index b0ca972a732e..1e92d15f3fd9 100644
--- a/pkg/netcertmanager/controller.go
+++ b/pkg/netcertmanager/controller.go
@@ -18,7 +18,6 @@ package netcertmanager
 
 import (
 	"context"
-	config2 "knative.dev/serving/pkg/netcertmanager/config"
 
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
@@ -39,6 +38,7 @@ import (
 	cmchallengeinformer "knative.dev/serving/pkg/netcertmanager/client/certmanager/injection/informers/acme/v1/challenge"
 	cmcertinformer "knative.dev/serving/pkg/netcertmanager/client/certmanager/injection/informers/certmanager/v1/certificate"
 	clusterinformer "knative.dev/serving/pkg/netcertmanager/client/certmanager/injection/informers/certmanager/v1/clusterissuer"
+	netcertmanageronfig "knative.dev/serving/pkg/netcertmanager/config"
 )
 
 const controllerAgentName = "certificate-controller"
@@ -82,7 +82,7 @@ func NewController(
 
 	impl := certreconciler.NewImpl(ctx, c, netcfg.CertManagerCertificateClassName,
 		func(impl *controller.Impl) controller.Options {
-			configStore := config2.NewStore(logger.Named("config-store"), configmap.TypeFilter(&config2.CertManagerConfig{})(func(string, interface{}) {
+			configStore := netcertmanageronfig.NewStore(logger.Named("config-store"), configmap.TypeFilter(&netcertmanageronfig.CertManagerConfig{})(func(string, interface{}) {
 				impl.FilteredGlobalResync(classFilterFunc, knCertificateInformer.Informer())
 			}))
 			configStore.WatchConfigs(cmw)
diff --git a/pkg/netcertmanager/resources/cert_manager_certificate.go b/pkg/netcertmanager/resources/cert_manager_certificate.go
index 5e7b8c1a3290..3432ce30f927 100644
--- a/pkg/netcertmanager/resources/cert_manager_certificate.go
+++ b/pkg/netcertmanager/resources/cert_manager_certificate.go
@@ -18,7 +18,6 @@ package resources
 
 import (
 	"fmt"
-	"knative.dev/serving/pkg/netcertmanager/config"
 
 	cmv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
@@ -29,6 +28,7 @@ import (
 	netapi "knative.dev/networking/pkg/config"
 	"knative.dev/pkg/apis"
 	"knative.dev/pkg/kmeta"
+	"knative.dev/serving/pkg/netcertmanager/config"
 )
 
 const (
diff --git a/pkg/netcertmanager/resources/cert_manager_certificate_test.go b/pkg/netcertmanager/resources/cert_manager_certificate_test.go
index b7db7696929a..87829c265eca 100644
--- a/pkg/netcertmanager/resources/cert_manager_certificate_test.go
+++ b/pkg/netcertmanager/resources/cert_manager_certificate_test.go
@@ -18,7 +18,6 @@ package resources
 
 import (
 	"fmt"
-	"knative.dev/serving/pkg/netcertmanager/config"
 	"strings"
 	"testing"
 
@@ -32,6 +31,7 @@ import (
 	"knative.dev/networking/pkg/apis/networking"
 	"knative.dev/networking/pkg/apis/networking/v1alpha1"
 	"knative.dev/pkg/kmeta"
+	"knative.dev/serving/pkg/netcertmanager/config"
 )
 
 const (