diff --git a/operator/Makefile b/operator/Makefile
index 3603adc160..349d907da0 100644
--- a/operator/Makefile
+++ b/operator/Makefile
@@ -50,7 +50,7 @@ BUNDLE_IMAGE_TAG ?= $(LC_VERSION)
 BUNDLE_IMAGE ?= $(IMAGE_REGISTRY)/$(BUNDLE_IMAGE_NAME):$(BUNDLE_IMAGE_TAG)
 ADDITIONAL_BUNDLE_IMAGE ?= $(IMAGE_REGISTRY)/$(BUNDLE_IMAGE_NAME):$(ADDITIONAL_BUNDLE_TAG)
 
-AC_PACKAGE_NAME ?= api-controller
+AC_PACKAGE_NAME ?= apicurio-api-controller
 AC_PACKAGE_VERSION ?= 0.0.1
 AC_PACKAGE ?= $(AC_PACKAGE_NAME).v$(AC_PACKAGE_VERSION)
 
@@ -76,10 +76,10 @@ ADDITIONAL_CATALOG_IMAGE_TAG ?= latest$(LC_VERSION_SUFFIX)
 ADDITIONAL_CATALOG_IMAGE ?= $(IMAGE_REGISTRY)/$(CATALOG_IMAGE_NAME):$(ADDITIONAL_CATALOG_IMAGE_TAG)
 
 AC_CATALOG_DIR ?= olm-tests/src/test/deploy/api-controller-catalog
-AC_CATALOG_TARGET_DIR ?= target/api-controller-catalog
+AC_CATALOG_TARGET_DIR ?= target/apicurio-api-controller-catalog
 
 AC_CATALOG_IMAGE_TAG ?= 0.0.1
-AC_CATALOG_IMAGE ?= $(IMAGE_REGISTRY)/api-controller-operator-catalog:$(CATALOG_IMAGE_TAG)
+AC_CATALOG_IMAGE ?= $(IMAGE_REGISTRY)/apicurio-api-controller-operator-catalog:$(CATALOG_IMAGE_TAG)
 
 ### Install
 
diff --git a/operator/controller/src/main/deploy/api-controller-csv/api-controller.clusterserviceversion.yaml b/operator/controller/src/main/deploy/api-controller-csv/apicurio-api-controller.clusterserviceversion.yaml
similarity index 100%
rename from operator/controller/src/main/deploy/api-controller-csv/api-controller.clusterserviceversion.yaml
rename to operator/controller/src/main/deploy/api-controller-csv/apicurio-api-controller.clusterserviceversion.yaml
diff --git a/operator/controller/src/main/deploy/api-controller-csv/kustomization.yaml b/operator/controller/src/main/deploy/api-controller-csv/kustomization.yaml
index ae6ffa1650..8dee0a2b65 100644
--- a/operator/controller/src/main/deploy/api-controller-csv/kustomization.yaml
+++ b/operator/controller/src/main/deploy/api-controller-csv/kustomization.yaml
@@ -6,7 +6,7 @@ resources:
   - ../crd
   - ../operator
   - ../api-controller-examples
-  - api-controller.clusterserviceversion.yaml
+  - apicurio-api-controller.clusterserviceversion.yaml
 
 patches:
   - target:
diff --git a/operator/olm-tests/src/test/deploy/api-controller-catalog/catalog-source.yaml b/operator/olm-tests/src/test/deploy/api-controller-catalog/catalog-source.yaml
index 2b94410995..921f4e1370 100644
--- a/operator/olm-tests/src/test/deploy/api-controller-catalog/catalog-source.yaml
+++ b/operator/olm-tests/src/test/deploy/api-controller-catalog/catalog-source.yaml
@@ -1,7 +1,7 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
-  name: api-controller-operator-catalog
+  name: apicurio-api-controller-operator-catalog
   namespace: ${PLACEHOLDER_CATALOG_NAMESPACE}
 spec:
   sourceType: grpc
diff --git a/operator/olm-tests/src/test/deploy/api-controller-catalog/operator-group.yaml b/operator/olm-tests/src/test/deploy/api-controller-catalog/operator-group.yaml
index a0902310a2..dcb8666f21 100644
--- a/operator/olm-tests/src/test/deploy/api-controller-catalog/operator-group.yaml
+++ b/operator/olm-tests/src/test/deploy/api-controller-catalog/operator-group.yaml
@@ -1,7 +1,7 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  name: api-controller-operator-group
+  name: apicurio-api-controller-operator-group
   namespace: ${PLACEHOLDER_NAMESPACE}
 spec:
   targetNamespaces:
diff --git a/operator/olm-tests/src/test/deploy/api-controller-catalog/subscription.yaml b/operator/olm-tests/src/test/deploy/api-controller-catalog/subscription.yaml
index b6feba07e9..533fd6fc20 100644
--- a/operator/olm-tests/src/test/deploy/api-controller-catalog/subscription.yaml
+++ b/operator/olm-tests/src/test/deploy/api-controller-catalog/subscription.yaml
@@ -1,7 +1,7 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: api-controller-subscription
+  name: apicurio-api-controller-subscription
   namespace: ${PLACEHOLDER_NAMESPACE}
 spec:
   sourceNamespace: ${PLACEHOLDER_CATALOG_NAMESPACE}