diff --git a/helm/ingress-controller/Chart.yaml b/helm/ingress-controller/Chart.yaml
index d6929f6b..c136b587 100644
--- a/helm/ingress-controller/Chart.yaml
+++ b/helm/ingress-controller/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: ngrok-ingress-controller
+name: kubernetes-ingress-controller
 description: A Kubernetes ingress controller built using ngrok.
 version: 0.4.0
 appVersion: 0.2.0
@@ -11,5 +11,5 @@ keywords:
   - api gateway
 home: https://ngrok.com
 sources:
-  - https://github.com/ngrok/ngrok-ingress-controller
+  - https://github.com/ngrok/kubernetes-ingress-controller
 icon: https://blog.ngrok.com/_next/image?url=%2Fassets%2Fblog%2Fplaceholder.png&w=1920&q=75
diff --git a/helm/ingress-controller/README.md b/helm/ingress-controller/README.md
index d389a685..1b76e814 100644
--- a/helm/ingress-controller/README.md
+++ b/helm/ingress-controller/README.md
@@ -24,7 +24,7 @@ the latest versions of the packages.  You can then run `helm search repo ngrok`
 
 To install the ngrok-ingress-controller chart:
 
-`helm install my-ngrok-ingress-controller ngrok/ngrok-ingress-controller`
+`helm install my-ngrok-ingress-controller ngrok/kubernetes-ingress-controller`
 
 To uninstall the chart:
 
@@ -50,7 +50,7 @@ To uninstall the chart:
 | `podAnnotations`             | Used to inject custom annotations directly into                                                                       | `{}`                             |
 | `replicaCount`               | The number of controllers and agents to run.                                                                          | `1`                              |
 | `image.registry`             | The ngrok ingress controller image registry.                                                                          | `docker.io`                      |
-| `image.repository`           | The ngrok ingress controller image repository.                                                                        | `ngrok/ngrok-ingress-controller` |
+| `image.repository`           | The ngrok ingress controller image repository.                                                                        | `ngrok/kubernetes-ingress-controller` |
 | `image.tag`                  | The ngrok ingress controller image tag.                                                                               | `latest`                         |
 | `image.pullPolicy`           | The ngrok ingress controller image pull policy.                                                                       | `IfNotPresent`                   |
 | `image.pullSecrets`          | An array of imagePullSecrets to be used when pulling the image.                                                       | `[]`                             |
diff --git a/helm/ingress-controller/templates/_helpers.tpl b/helm/ingress-controller/templates/_helpers.tpl
index 4f28a355..e9117e72 100644
--- a/helm/ingress-controller/templates/_helpers.tpl
+++ b/helm/ingress-controller/templates/_helpers.tpl
@@ -2,14 +2,14 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "ngrok-ingress-controller.name" -}}
+{{- define "kubernetes-ingress-controller.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "ngrok-ingress-controller.chart" -}}
+{{- define "kubernetes-ingress-controller.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -17,7 +17,7 @@ Create chart name and version as used by the chart label.
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "ngrok-ingress-controller.fullname" -}}
+{{- define "kubernetes-ingress-controller.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -33,24 +33,24 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{/*
 Create a default name for the credentials secret name using the helm release
 */}}
-{{- define "ngrok-ingress-controller.credentialsSecretName" -}}
+{{- define "kubernetes-ingress-controller.credentialsSecretName" -}}
 {{- if .Values.credentials.secret.name -}}
 {{- .Values.credentials.secret.name -}}
 {{- else -}}
-{{- printf "%s-credentials" (include "ngrok-ingress-controller.fullname" .) -}}
+{{- printf "%s-credentials" (include "kubernetes-ingress-controller.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
 Common labels
 */}}
-{{- define "ngrok-ingress-controller.labels" -}}
-helm.sh/chart: {{ include "ngrok-ingress-controller.chart" . }}
-{{ include "ngrok-ingress-controller.selectorLabels" . }}
+{{- define "kubernetes-ingress-controller.labels" -}}
+helm.sh/chart: {{ include "kubernetes-ingress-controller.chart" . }}
+{{ include "kubernetes-ingress-controller.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-app.kubernetes.io/part-of: {{ template "ngrok-ingress-controller.name" . }}
+app.kubernetes.io/part-of: {{ template "kubernetes-ingress-controller.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Values.commonLabels}}
 {{ toYaml .Values.commonLabels }}
@@ -60,17 +60,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "ngrok-ingress-controller.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "ngrok-ingress-controller.name" . }}
+{{- define "kubernetes-ingress-controller.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kubernetes-ingress-controller.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Create the name of the controller service account to use
 */}}
-{{- define "ngrok-ingress-controller.serviceAccountName" -}}
+{{- define "kubernetes-ingress-controller.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "ngrok-ingress-controller.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "kubernetes-ingress-controller.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
@@ -79,7 +79,7 @@ Create the name of the controller service account to use
 {{/*
 Return the ngrok/ingress-controller image name
 */}}
-{{- define "ngrok-ingress-controller.image" -}}
+{{- define "kubernetes-ingress-controller.image" -}}
 {{- $registryName := .Values.image.registry -}}
 {{- $repositoryName := .Values.image.repository -}}
 {{- $tag := .Values.image.tag | toString -}}
diff --git a/helm/ingress-controller/templates/agent-config-cm.yaml b/helm/ingress-controller/templates/agent-config-cm.yaml
index 00860918..45357991 100644
--- a/helm/ingress-controller/templates/agent-config-cm.yaml
+++ b/helm/ingress-controller/templates/agent-config-cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "ngrok-ingress-controller.fullname" . }}-agent-cm
+  name: {{ include "kubernetes-ingress-controller.fullname" . }}-agent-cm
   namespace: {{ .Release.Namespace }}
 data:
   METADATA: "{{ .Values.metaData }}"
diff --git a/helm/ingress-controller/templates/controller-cm.yaml b/helm/ingress-controller/templates/controller-cm.yaml
index 385b8ed5..88728341 100644
--- a/helm/ingress-controller/templates/controller-cm.yaml
+++ b/helm/ingress-controller/templates/controller-cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "ngrok-ingress-controller.fullname" . }}-manager-config
+  name: {{ include "kubernetes-ingress-controller.fullname" . }}-manager-config
   namespace: {{ .Release.Namespace }}
 data:
   controller_manager_config.yaml: |
@@ -13,4 +13,4 @@ data:
       bindAddress: 127.0.0.1:8080
     leaderElection:
       leaderElect: true
-      resourceName: {{ include "ngrok-ingress-controller.fullname" . }}-leader
+      resourceName: {{ include "kubernetes-ingress-controller.fullname" . }}-leader
diff --git a/helm/ingress-controller/templates/controller-deployment.yaml b/helm/ingress-controller/templates/controller-deployment.yaml
index 01c59363..f6c72d59 100644
--- a/helm/ingress-controller/templates/controller-deployment.yaml
+++ b/helm/ingress-controller/templates/controller-deployment.yaml
@@ -2,9 +2,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    {{- include "ngrok-ingress-controller.labels" . | nindent 4 }}
+    {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
-  name: {{ include "ngrok-ingress-controller.fullname" . }}-manager
+  name: {{ include "kubernetes-ingress-controller.fullname" . }}-manager
   namespace: {{ .Release.Namespace }}
   annotations:
     checksum/agent-config: {{ include (print $.Template.BasePath "/agent-config-cm.yaml") . | sha256sum }}
@@ -14,7 +14,7 @@ spec:
   replicas: {{.Values.replicaCount}}
   selector:
     matchLabels:
-      {{- include "ngrok-ingress-controller.selectorLabels" . | nindent 6 }}
+      {{- include "kubernetes-ingress-controller.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: controller
   template:
     metadata:
@@ -27,17 +27,17 @@ spec:
         prometheus.io/port: '8080'
         prometheus.io/scrape: 'true'
       labels:
-        {{- include "ngrok-ingress-controller.selectorLabels" . | nindent 8 }}
+        {{- include "kubernetes-ingress-controller.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: controller
     spec:
-      serviceAccountName: {{ template "ngrok-ingress-controller.serviceAccountName" . }}
+      serviceAccountName: {{ template "kubernetes-ingress-controller.serviceAccountName" . }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
         {{- toYaml .Values.image.pullSecrets | nindent 8 }}
       {{- end }}
       containers:
       - name: ngrok-ingress-controller
-        image: {{ include "ngrok-ingress-controller.image" . }}
+        image: {{ include "kubernetes-ingress-controller.image" . }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         command:
         - /manager
@@ -50,7 +50,7 @@ spec:
         {{- end }}
         - --health-probe-bind-address=:8081
         - --metrics-bind-address=:8080
-        - --election-id={{ include "ngrok-ingress-controller.fullname" . }}-leader
+        - --election-id={{ include "kubernetes-ingress-controller.fullname" . }}-leader
         securityContext:
           allowPrivilegeEscalation: false
         env:
@@ -58,12 +58,12 @@ spec:
           valueFrom:
             secretKeyRef:
               key: API_KEY
-              name: {{ include "ngrok-ingress-controller.credentialsSecretName" . }}
+              name: {{ include "kubernetes-ingress-controller.credentialsSecretName" . }}
         - name: NGROK_AUTHTOKEN
           valueFrom:
             secretKeyRef:
               key: AUTHTOKEN
-              name: {{ include "ngrok-ingress-controller.credentialsSecretName" . }}
+              name: {{ include "kubernetes-ingress-controller.credentialsSecretName" . }}
         - name: POD_NAMESPACE
           valueFrom:
             fieldRef:
diff --git a/helm/ingress-controller/templates/controller-rbac.yaml b/helm/ingress-controller/templates/controller-rbac.yaml
index 17503733..82fade5c 100644
--- a/helm/ingress-controller/templates/controller-rbac.yaml
+++ b/helm/ingress-controller/templates/controller-rbac.yaml
@@ -66,7 +66,7 @@ roleRef:
   name: ngrok-ingress-controller-leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: {{ template "ngrok-ingress-controller.serviceAccountName" . }}
+  name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -79,7 +79,7 @@ roleRef:
   name: ngrok-ingress-controller-manager-role
 subjects:
 - kind: ServiceAccount
-  name: {{ template "ngrok-ingress-controller.serviceAccountName" . }}
+  name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -92,5 +92,5 @@ roleRef:
   name: ngrok-ingress-controller-proxy-role
 subjects:
 - kind: ServiceAccount
-  name: {{ template "ngrok-ingress-controller.serviceAccountName" . }}
+  name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
diff --git a/helm/ingress-controller/templates/controller-serviceaccount.yaml b/helm/ingress-controller/templates/controller-serviceaccount.yaml
index efc1e395..d80a5d8c 100644
--- a/helm/ingress-controller/templates/controller-serviceaccount.yaml
+++ b/helm/ingress-controller/templates/controller-serviceaccount.yaml
@@ -3,10 +3,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ template "ngrok-ingress-controller.serviceAccountName" . }}
+  name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "ngrok-ingress-controller.labels" . | nindent 4 }}
+    {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
   {{- if .Values.serviceAccount.annotations }}
   annotations:
diff --git a/helm/ingress-controller/templates/credentials-secret.yaml b/helm/ingress-controller/templates/credentials-secret.yaml
index 4ec26c06..e6e1a92a 100644
--- a/helm/ingress-controller/templates/credentials-secret.yaml
+++ b/helm/ingress-controller/templates/credentials-secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "ngrok-ingress-controller.credentialsSecretName" .}}
+  name: {{ include "kubernetes-ingress-controller.credentialsSecretName" .}}
 type: Opaque
 data:
   API_KEY: {{ required "An ngrok API key is required" .Values.credentials.apiKey | b64enc }}
diff --git a/helm/ingress-controller/templates/ingress-class.yaml b/helm/ingress-controller/templates/ingress-class.yaml
index e202c516..89da2e36 100644
--- a/helm/ingress-controller/templates/ingress-class.yaml
+++ b/helm/ingress-controller/templates/ingress-class.yaml
@@ -3,7 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: IngressClass
 metadata:
   labels:
-    {{- include "ngrok-ingress-controller.labels" . | nindent 4 }}
+    {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
   name: {{ .Values.ingressClass.name }}
   {{- if .Values.ingressClass.default }}
diff --git a/helm/ingress-controller/templates/rbac/domain_editor_role.yaml b/helm/ingress-controller/templates/rbac/domain_editor_role.yaml
index e7974e90..88e527a3 100644
--- a/helm/ingress-controller/templates/rbac/domain_editor_role.yaml
+++ b/helm/ingress-controller/templates/rbac/domain_editor_role.yaml
@@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    {{- include "ngrok-ingress-controller.labels" . | nindent 4 }}
+    {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }}
     app.kubernetes.io/component: rbac
-  name: {{ include "ngrok-ingress-controller.fullname" . }}-domain-editor-role
+  name: {{ include "kubernetes-ingress-controller.fullname" . }}-domain-editor-role
 rules:
 - apiGroups:
   - ingress.k8s.ngrok.com
diff --git a/helm/ingress-controller/templates/rbac/domain_viewer_role.yaml b/helm/ingress-controller/templates/rbac/domain_viewer_role.yaml
index 5256b4b3..bf5f5196 100644
--- a/helm/ingress-controller/templates/rbac/domain_viewer_role.yaml
+++ b/helm/ingress-controller/templates/rbac/domain_viewer_role.yaml
@@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    {{- include "ngrok-ingress-controller.labels" . | nindent 4 }}
+    {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }}
     app.kubernetes.io/component: rbac
-  name: {{ include "ngrok-ingress-controller.fullname" . }}-domain-viewer-role
+  name: {{ include "kubernetes-ingress-controller.fullname" . }}-domain-viewer-role
 rules:
 - apiGroups:
   - ingress.k8s.ngrok.com
diff --git a/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml b/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml
index da835def..ab727516 100644
--- a/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml
+++ b/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml
@@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    {{- include "ngrok-ingress-controller.labels" . | nindent 4 }}
+    {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }}
     app.kubernetes.io/component: rbac
-  name: {{ include "ngrok-ingress-controller.fullname" . }}-tunnel-editor-role
+  name: {{ include "kubernetes-ingress-controller.fullname" . }}-tunnel-editor-role
 rules:
 - apiGroups:
   - ingress.k8s.ngrok.com
diff --git a/helm/ingress-controller/templates/rbac/tunnel_viewer_role.yaml b/helm/ingress-controller/templates/rbac/tunnel_viewer_role.yaml
index 0343f100..dfdb4b6f 100644
--- a/helm/ingress-controller/templates/rbac/tunnel_viewer_role.yaml
+++ b/helm/ingress-controller/templates/rbac/tunnel_viewer_role.yaml
@@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    {{- include "ngrok-ingress-controller.labels" . | nindent 4 }}
+    {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }}
     app.kubernetes.io/component: rbac
-  name: {{ include "ngrok-ingress-controller.fullname" . }}-tunnel-viewer-role
+  name: {{ include "kubernetes-ingress-controller.fullname" . }}-tunnel-viewer-role
 rules:
 - apiGroups:
   - ingress.k8s.ngrok.com
diff --git a/helm/ingress-controller/tests/__snapshot__/agent-config-cm_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/agent-config-cm_test.yaml.snap
index 609963ac..341fb9a4 100644
--- a/helm/ingress-controller/tests/__snapshot__/agent-config-cm_test.yaml.snap
+++ b/helm/ingress-controller/tests/__snapshot__/agent-config-cm_test.yaml.snap
@@ -7,5 +7,5 @@ Should match snapshot:
       REMOTE_MANAGEMENT: ""
     kind: ConfigMap
     metadata:
-      name: RELEASE-NAME-ngrok-ingress-controller-agent-cm
+      name: RELEASE-NAME-kubernetes-ingress-controller-agent-cm
       namespace: NAMESPACE
diff --git a/helm/ingress-controller/tests/__snapshot__/controller-cm_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/controller-cm_test.yaml.snap
index b87adbfa..e55b1ddc 100644
--- a/helm/ingress-controller/tests/__snapshot__/controller-cm_test.yaml.snap
+++ b/helm/ingress-controller/tests/__snapshot__/controller-cm_test.yaml.snap
@@ -11,8 +11,8 @@ should match snapshot:
           bindAddress: 127.0.0.1:8080
         leaderElection:
           leaderElect: true
-          resourceName: test-release-ngrok-ingress-controller-leader
+          resourceName: test-release-kubernetes-ingress-controller-leader
     kind: ConfigMap
     metadata:
-      name: test-release-ngrok-ingress-controller-manager-config
+      name: test-release-kubernetes-ingress-controller-manager-config
       namespace: test-namespace
diff --git a/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap
index 5adbb6a5..8e6fc235 100644
--- a/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap
+++ b/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap
@@ -4,18 +4,18 @@ Should match all-options snapshot:
     kind: Deployment
     metadata:
       annotations:
-        checksum/agent-config: 3671fa6e906913b7e88c956cd85864fb4a056335e2676f8fce44a1cfafba37d6
+        checksum/agent-config: 3b489411f7beac52b84c9645f888cd57f483193fded2b336a5737c9a59760e51
         checksum/controller-role: 78f53a459d02fa3696fbc4c74b0c84b3bb8d23fa0500b544ada31209bc908fd8
-        checksum/rbac: d65fd1d397f0da2dc2888c7af42265b5a47272fbbf56a0c3331023d949f3c58b
+        checksum/rbac: d31fdcb337a6f1ee71323040c2cbc4d5580d73ae5f7623cd19be57db97f748c1
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
-        app.kubernetes.io/name: ngrok-ingress-controller
-        app.kubernetes.io/part-of: ngrok-ingress-controller
+        app.kubernetes.io/name: kubernetes-ingress-controller
+        app.kubernetes.io/part-of: kubernetes-ingress-controller
         app.kubernetes.io/version: 0.2.0
-        helm.sh/chart: ngrok-ingress-controller-0.4.0
-      name: RELEASE-NAME-ngrok-ingress-controller-manager
+        helm.sh/chart: kubernetes-ingress-controller-0.4.0
+      name: RELEASE-NAME-kubernetes-ingress-controller-manager
       namespace: NAMESPACE
     spec:
       replicas: 1
@@ -23,7 +23,7 @@ Should match all-options snapshot:
         matchLabels:
           app.kubernetes.io/component: controller
           app.kubernetes.io/instance: RELEASE-NAME
-          app.kubernetes.io/name: ngrok-ingress-controller
+          app.kubernetes.io/name: kubernetes-ingress-controller
       template:
         metadata:
           annotations:
@@ -34,13 +34,13 @@ Should match all-options snapshot:
           labels:
             app.kubernetes.io/component: controller
             app.kubernetes.io/instance: RELEASE-NAME
-            app.kubernetes.io/name: ngrok-ingress-controller
+            app.kubernetes.io/name: kubernetes-ingress-controller
         spec:
           containers:
           - args:
             - --health-probe-bind-address=:8081
             - --metrics-bind-address=:8080
-            - --election-id=RELEASE-NAME-ngrok-ingress-controller-leader
+            - --election-id=RELEASE-NAME-kubernetes-ingress-controller-leader
             command:
             - /manager
             env:
@@ -48,12 +48,12 @@ Should match all-options snapshot:
               valueFrom:
                 secretKeyRef:
                   key: API_KEY
-                  name: RELEASE-NAME-ngrok-ingress-controller-credentials
+                  name: RELEASE-NAME-kubernetes-ingress-controller-credentials
             - name: NGROK_AUTHTOKEN
               valueFrom:
                 secretKeyRef:
                   key: AUTHTOKEN
-                  name: RELEASE-NAME-ngrok-ingress-controller-credentials
+                  name: RELEASE-NAME-kubernetes-ingress-controller-credentials
             - name: POD_NAMESPACE
               valueFrom:
                 fieldRef:
@@ -65,7 +65,7 @@ Should match all-options snapshot:
                 value: test-value
             - name: TEST_ENV_VAR
               value: test
-            image: docker.io/ngrok/ngrok-ingress-controller:latest
+            image: docker.io/ngrok/kubernetes-ingress-controller:latest
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -88,7 +88,7 @@ Should match all-options snapshot:
             volumeMounts:
             - mountPath: /test-volume
               name: test-volume
-          serviceAccountName: RELEASE-NAME-ngrok-ingress-controller
+          serviceAccountName: RELEASE-NAME-kubernetes-ingress-controller
           volumes:
           - emptyDir: {}
             name: test-volume
@@ -100,7 +100,7 @@ Should match all-options snapshot:
       REMOTE_MANAGEMENT: ""
     kind: ConfigMap
     metadata:
-      name: RELEASE-NAME-ngrok-ingress-controller-agent-cm
+      name: RELEASE-NAME-kubernetes-ingress-controller-agent-cm
       namespace: NAMESPACE
   3: |
     apiVersion: rbac.authorization.k8s.io/v1
@@ -170,7 +170,7 @@ Should match all-options snapshot:
       name: ngrok-ingress-controller-leader-election-role
     subjects:
     - kind: ServiceAccount
-      name: RELEASE-NAME-ngrok-ingress-controller
+      name: RELEASE-NAME-kubernetes-ingress-controller
       namespace: NAMESPACE
   6: |
     apiVersion: rbac.authorization.k8s.io/v1
@@ -183,7 +183,7 @@ Should match all-options snapshot:
       name: ngrok-ingress-controller-manager-role
     subjects:
     - kind: ServiceAccount
-      name: RELEASE-NAME-ngrok-ingress-controller
+      name: RELEASE-NAME-kubernetes-ingress-controller
       namespace: NAMESPACE
   7: |
     apiVersion: rbac.authorization.k8s.io/v1
@@ -196,7 +196,7 @@ Should match all-options snapshot:
       name: ngrok-ingress-controller-proxy-role
     subjects:
     - kind: ServiceAccount
-      name: RELEASE-NAME-ngrok-ingress-controller
+      name: RELEASE-NAME-kubernetes-ingress-controller
       namespace: NAMESPACE
   8: |
     apiVersion: rbac.authorization.k8s.io/v1
@@ -367,18 +367,18 @@ Should match default snapshot:
     kind: Deployment
     metadata:
       annotations:
-        checksum/agent-config: 3671fa6e906913b7e88c956cd85864fb4a056335e2676f8fce44a1cfafba37d6
+        checksum/agent-config: 3b489411f7beac52b84c9645f888cd57f483193fded2b336a5737c9a59760e51
         checksum/controller-role: 78f53a459d02fa3696fbc4c74b0c84b3bb8d23fa0500b544ada31209bc908fd8
-        checksum/rbac: d65fd1d397f0da2dc2888c7af42265b5a47272fbbf56a0c3331023d949f3c58b
+        checksum/rbac: d31fdcb337a6f1ee71323040c2cbc4d5580d73ae5f7623cd19be57db97f748c1
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
-        app.kubernetes.io/name: ngrok-ingress-controller
-        app.kubernetes.io/part-of: ngrok-ingress-controller
+        app.kubernetes.io/name: kubernetes-ingress-controller
+        app.kubernetes.io/part-of: kubernetes-ingress-controller
         app.kubernetes.io/version: 0.2.0
-        helm.sh/chart: ngrok-ingress-controller-0.4.0
-      name: RELEASE-NAME-ngrok-ingress-controller-manager
+        helm.sh/chart: kubernetes-ingress-controller-0.4.0
+      name: RELEASE-NAME-kubernetes-ingress-controller-manager
       namespace: NAMESPACE
     spec:
       replicas: 1
@@ -386,7 +386,7 @@ Should match default snapshot:
         matchLabels:
           app.kubernetes.io/component: controller
           app.kubernetes.io/instance: RELEASE-NAME
-          app.kubernetes.io/name: ngrok-ingress-controller
+          app.kubernetes.io/name: kubernetes-ingress-controller
       template:
         metadata:
           annotations:
@@ -397,13 +397,13 @@ Should match default snapshot:
           labels:
             app.kubernetes.io/component: controller
             app.kubernetes.io/instance: RELEASE-NAME
-            app.kubernetes.io/name: ngrok-ingress-controller
+            app.kubernetes.io/name: kubernetes-ingress-controller
         spec:
           containers:
           - args:
             - --health-probe-bind-address=:8081
             - --metrics-bind-address=:8080
-            - --election-id=RELEASE-NAME-ngrok-ingress-controller-leader
+            - --election-id=RELEASE-NAME-kubernetes-ingress-controller-leader
             command:
             - /manager
             env:
@@ -411,17 +411,17 @@ Should match default snapshot:
               valueFrom:
                 secretKeyRef:
                   key: API_KEY
-                  name: RELEASE-NAME-ngrok-ingress-controller-credentials
+                  name: RELEASE-NAME-kubernetes-ingress-controller-credentials
             - name: NGROK_AUTHTOKEN
               valueFrom:
                 secretKeyRef:
                   key: AUTHTOKEN
-                  name: RELEASE-NAME-ngrok-ingress-controller-credentials
+                  name: RELEASE-NAME-kubernetes-ingress-controller-credentials
             - name: POD_NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: docker.io/ngrok/ngrok-ingress-controller:latest
+            image: docker.io/ngrok/kubernetes-ingress-controller:latest
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -441,7 +441,7 @@ Should match default snapshot:
               requests: {}
             securityContext:
               allowPrivilegeEscalation: false
-          serviceAccountName: RELEASE-NAME-ngrok-ingress-controller
+          serviceAccountName: RELEASE-NAME-kubernetes-ingress-controller
   2: |
     apiVersion: v1
     data:
@@ -450,7 +450,7 @@ Should match default snapshot:
       REMOTE_MANAGEMENT: ""
     kind: ConfigMap
     metadata:
-      name: RELEASE-NAME-ngrok-ingress-controller-agent-cm
+      name: RELEASE-NAME-kubernetes-ingress-controller-agent-cm
       namespace: NAMESPACE
   3: |
     apiVersion: rbac.authorization.k8s.io/v1
@@ -520,7 +520,7 @@ Should match default snapshot:
       name: ngrok-ingress-controller-leader-election-role
     subjects:
     - kind: ServiceAccount
-      name: RELEASE-NAME-ngrok-ingress-controller
+      name: RELEASE-NAME-kubernetes-ingress-controller
       namespace: NAMESPACE
   6: |
     apiVersion: rbac.authorization.k8s.io/v1
@@ -533,7 +533,7 @@ Should match default snapshot:
       name: ngrok-ingress-controller-manager-role
     subjects:
     - kind: ServiceAccount
-      name: RELEASE-NAME-ngrok-ingress-controller
+      name: RELEASE-NAME-kubernetes-ingress-controller
       namespace: NAMESPACE
   7: |
     apiVersion: rbac.authorization.k8s.io/v1
@@ -546,7 +546,7 @@ Should match default snapshot:
       name: ngrok-ingress-controller-proxy-role
     subjects:
     - kind: ServiceAccount
-      name: RELEASE-NAME-ngrok-ingress-controller
+      name: RELEASE-NAME-kubernetes-ingress-controller
       namespace: NAMESPACE
   8: |
     apiVersion: rbac.authorization.k8s.io/v1
diff --git a/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap
index d10ecfc2..ecba0815 100644
--- a/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap
+++ b/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap
@@ -67,7 +67,7 @@ Should match snapshot:
       name: ngrok-ingress-controller-leader-election-role
     subjects:
     - kind: ServiceAccount
-      name: RELEASE-NAME-ngrok-ingress-controller
+      name: RELEASE-NAME-kubernetes-ingress-controller
       namespace: NAMESPACE
   4: |
     apiVersion: rbac.authorization.k8s.io/v1
@@ -80,7 +80,7 @@ Should match snapshot:
       name: ngrok-ingress-controller-manager-role
     subjects:
     - kind: ServiceAccount
-      name: RELEASE-NAME-ngrok-ingress-controller
+      name: RELEASE-NAME-kubernetes-ingress-controller
       namespace: NAMESPACE
   5: |
     apiVersion: rbac.authorization.k8s.io/v1
@@ -93,5 +93,5 @@ Should match snapshot:
       name: ngrok-ingress-controller-proxy-role
     subjects:
     - kind: ServiceAccount
-      name: RELEASE-NAME-ngrok-ingress-controller
+      name: RELEASE-NAME-kubernetes-ingress-controller
       namespace: NAMESPACE
diff --git a/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap
index 857d934e..e444828f 100644
--- a/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap
+++ b/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap
@@ -7,9 +7,9 @@ Should match the snapshot:
         app.kubernetes.io/component: controller
         app.kubernetes.io/instance: test-release
         app.kubernetes.io/managed-by: Helm
-        app.kubernetes.io/name: ngrok-ingress-controller
-        app.kubernetes.io/part-of: ngrok-ingress-controller
+        app.kubernetes.io/name: kubernetes-ingress-controller
+        app.kubernetes.io/part-of: kubernetes-ingress-controller
         app.kubernetes.io/version: 0.2.0
-        helm.sh/chart: ngrok-ingress-controller-0.4.0
-      name: test-release-ngrok-ingress-controller
+        helm.sh/chart: kubernetes-ingress-controller-0.4.0
+      name: test-release-kubernetes-ingress-controller
       namespace: test-namespace
diff --git a/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap
index f9484e47..e6ef425c 100644
--- a/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap
+++ b/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap
@@ -6,5 +6,5 @@ Should match snapshot:
       AUTHTOKEN: dGVzdC1hdXRodG9rZW4=
     kind: Secret
     metadata:
-      name: RELEASE-NAME-ngrok-ingress-controller-credentials
+      name: RELEASE-NAME-kubernetes-ingress-controller-credentials
     type: Opaque
diff --git a/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap
index 100f5886..b725a192 100644
--- a/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap
+++ b/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap
@@ -9,10 +9,10 @@ Should match snapshot:
         app.kubernetes.io/component: controller
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
-        app.kubernetes.io/name: ngrok-ingress-controller
-        app.kubernetes.io/part-of: ngrok-ingress-controller
+        app.kubernetes.io/name: kubernetes-ingress-controller
+        app.kubernetes.io/part-of: kubernetes-ingress-controller
         app.kubernetes.io/version: 0.2.0
-        helm.sh/chart: ngrok-ingress-controller-0.4.0
+        helm.sh/chart: kubernetes-ingress-controller-0.4.0
       name: ngrok
     spec:
       controller: k8s.ngrok.com/ingress-controller
diff --git a/helm/ingress-controller/tests/controller-cm_test.yaml b/helm/ingress-controller/tests/controller-cm_test.yaml
index 67c08852..be83fd98 100644
--- a/helm/ingress-controller/tests/controller-cm_test.yaml
+++ b/helm/ingress-controller/tests/controller-cm_test.yaml
@@ -27,7 +27,7 @@ tests:
   asserts:
   - equal:
       path: metadata.name
-      value: test-release-ngrok-ingress-controller-manager-config
+      value: test-release-kubernetes-ingress-controller-manager-config
 - it: Works when fullname is supplied
   set:
     fullnameOverride: fno
diff --git a/helm/ingress-controller/values.yaml b/helm/ingress-controller/values.yaml
index 083bfd6a..dd7a33a1 100644
--- a/helm/ingress-controller/values.yaml
+++ b/helm/ingress-controller/values.yaml
@@ -31,7 +31,7 @@ replicaCount: 1
 ## @param image.pullSecrets An array of imagePullSecrets to be used when pulling the image.
 image:
   registry: docker.io
-  repository: ngrok/ngrok-ingress-controller
+  repository: ngrok/kubernetes-ingress-controller
   tag: latest
   pullPolicy: IfNotPresent
   ## Example