diff --git a/testapp/certman-istio-controller/README.md b/testapp/certman-istio-controller/README.md
deleted file mode 100644
index f4c07db..0000000
--- a/testapp/certman-istio-controller/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Istio Cert Manager
-
-The Istio Cert Manager is an addon controller to support Cert-Manager's `ACME HTTP01` Issuer with Istio `Gateway` and `VirtualService` intgration.
-
-## Install
-
-Create the Custom Resource Definition:
-
-```
-kubectl apply -f crd.yaml
-```
-
-Grant permissions for the new controller:
-
-```
-kubectl apply -f rbac.yaml
-```
-
-Create the controller pod:
-
-```
-kubectl apply -f pod.yaml
-```
-
-## Cleanup
-
-```
-kubectl -n cert-manager exec certman-istio-controller /cleanup.sh
-kubectl delete -f pod.yaml
-kubectl delete -f rbac.yaml
-kubectl delete -f crd.yaml
-```
diff --git a/testapp/certman-istio-controller/Dockerfile b/testapp/certman-istio-operator/Dockerfile
similarity index 100%
rename from testapp/certman-istio-controller/Dockerfile
rename to testapp/certman-istio-operator/Dockerfile
diff --git a/testapp/certman-istio-controller/Makefile b/testapp/certman-istio-operator/Makefile
similarity index 86%
rename from testapp/certman-istio-controller/Makefile
rename to testapp/certman-istio-operator/Makefile
index 9f76335..fdd7381 100644
--- a/testapp/certman-istio-controller/Makefile
+++ b/testapp/certman-istio-operator/Makefile
@@ -1,5 +1,5 @@
 CC=docker
-APP=certman-istio-controller
+APP=certman-istio-operator
 TAG=127.0.0.1:5000/cert/$(APP):$(VERSION)
 
 all: build push
diff --git a/testapp/certman-istio-operator/README.md b/testapp/certman-istio-operator/README.md
new file mode 100644
index 0000000..1def82b
--- /dev/null
+++ b/testapp/certman-istio-operator/README.md
@@ -0,0 +1,32 @@
+# Istio Cert Manager Operator
+
+The Istio Cert Manager is an addon operator to support Cert-Manager's `ACME HTTP01` Issuer with Istio `Gateway` and `VirtualService` integration.
+
+## Install
+
+Create the Custom Resource Definition:
+
+```
+kubectl apply -f crd.yaml
+```
+
+Grant permissions for the new operator:
+
+```
+kubectl apply -f rbac.yaml
+```
+
+Create the operator pod:
+
+```
+kubectl apply -f pod.yaml
+```
+
+## Cleanup
+
+```
+kubectl -n cert-manager exec certman-istio-operator /cleanup.sh
+kubectl delete -f pod.yaml
+kubectl delete -f rbac.yaml
+kubectl delete -f crd.yaml
+```
diff --git a/testapp/certman-istio-controller/cleanup.sh b/testapp/certman-istio-operator/cleanup.sh
similarity index 100%
rename from testapp/certman-istio-controller/cleanup.sh
rename to testapp/certman-istio-operator/cleanup.sh
diff --git a/testapp/certman-istio-controller/crd.yaml b/testapp/certman-istio-operator/crd.yaml
similarity index 100%
rename from testapp/certman-istio-controller/crd.yaml
rename to testapp/certman-istio-operator/crd.yaml
diff --git a/testapp/certman-istio-controller/hooks/common/functions.sh b/testapp/certman-istio-operator/hooks/common/functions.sh
similarity index 99%
rename from testapp/certman-istio-controller/hooks/common/functions.sh
rename to testapp/certman-istio-operator/hooks/common/functions.sh
index 7f2ea6c..812ab1d 100644
--- a/testapp/certman-istio-controller/hooks/common/functions.sh
+++ b/testapp/certman-istio-operator/hooks/common/functions.sh
@@ -18,7 +18,7 @@ EOF
 
 mkmap() {
   kubectl apply -f - <<EOF
-apiVersion: cic.giftfish.de/v1alpha1
+apiVersion: cio.giftfish.de/v1alpha1
 kind: RefMap
 metadata:
   name: "$1"
diff --git a/testapp/certman-istio-controller/hooks/ingress-add.sh b/testapp/certman-istio-operator/hooks/ingress-add.sh
similarity index 100%
rename from testapp/certman-istio-controller/hooks/ingress-add.sh
rename to testapp/certman-istio-operator/hooks/ingress-add.sh
diff --git a/testapp/certman-istio-controller/hooks/ingress-delete.sh b/testapp/certman-istio-operator/hooks/ingress-delete.sh
similarity index 100%
rename from testapp/certman-istio-controller/hooks/ingress-delete.sh
rename to testapp/certman-istio-operator/hooks/ingress-delete.sh
diff --git a/testapp/certman-istio-controller/pod.yaml b/testapp/certman-istio-operator/pod.yaml
similarity index 55%
rename from testapp/certman-istio-controller/pod.yaml
rename to testapp/certman-istio-operator/pod.yaml
index b6ffc71..cb19ad1 100644
--- a/testapp/certman-istio-controller/pod.yaml
+++ b/testapp/certman-istio-operator/pod.yaml
@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: certman-istio-controller
+  name: certman-istio-operator
   namespace: cert-manager
   labels:
-    app: certman-istio-controller
+    app: certman-istio-operator
     version: v1
 spec:
   containers:
-  - name: certman-istio-controller
-    image: 127.0.0.1:5000/cert/certman-istio-controller:v1
+  - name: certman-istio-operator
+    image: 127.0.0.1:5000/cert/certman-istio-operator:v1
     resources:
       limits:
         cpu: 100m
@@ -18,4 +18,4 @@ spec:
         cpu: 100m
         memory: 128Mi
     imagePullPolicy: Always
-  serviceAccountName: certman-istio-controller
+  serviceAccountName: certman-istio-operator
diff --git a/testapp/certman-istio-controller/rbac.yaml b/testapp/certman-istio-operator/rbac.yaml
similarity index 79%
rename from testapp/certman-istio-controller/rbac.yaml
rename to testapp/certman-istio-operator/rbac.yaml
index 636cfad..41c7d47 100644
--- a/testapp/certman-istio-controller/rbac.yaml
+++ b/testapp/certman-istio-operator/rbac.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: certman-istio-controller
+  name: certman-istio-operator
   namespace: cert-manager
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: certman-istio-controller
+  name: certman-istio-operator
 rules:
 - apiGroups:
   - extensions
@@ -26,7 +26,7 @@ rules:
   - destinationrules
   verbs: ["get", "create", "delete"]
 - apiGroups:
-  - cic.giftfish.de
+  - cio.giftfish.de
   resources:
   - refmaps
   verbs: ["get", "list", "create", "delete"]
@@ -34,12 +34,12 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: certman-istio-controller
+  name: certman-istio-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: certman-istio-controller
+  name: certman-istio-operator
 subjects:
 - kind: ServiceAccount
-  name: certman-istio-controller
+  name: certman-istio-operator
   namespace: cert-manager