diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml
index 73c033fd1..1024ddc6e 100644
--- a/deploy/kubernetes/base/controller.yaml
+++ b/deploy/kubernetes/base/controller.yaml
@@ -13,8 +13,8 @@ spec:
       labels:
         app: gcp-compute-persistent-disk-csi-driver
     spec:
-      serviceAccountName: csi-controller-sa
-      priorityClassName: gce-pd-csi-driver-controller
+      serviceAccountName: csi-gce-pd-controller-sa
+      priorityClassName: csi-gce-pd-controller
       containers:
         - name: csi-provisioner
           image: gke.gcr.io/csi-provisioner
diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml
index 41cd0a1a4..ca2420fb0 100644
--- a/deploy/kubernetes/base/node.yaml
+++ b/deploy/kubernetes/base/node.yaml
@@ -12,8 +12,8 @@ spec:
       labels:
         app: gcp-compute-persistent-disk-csi-driver
     spec:
-      priorityClassName: gce-pd-csi-driver-node
-      serviceAccountName: csi-node-sa
+      priorityClassName: csi-gce-pd-node
+      serviceAccountName: csi-gce-pd-node-sa
       containers:
         - name: csi-driver-registrar
           image: gke.gcr.io/csi-node-driver-registrar
diff --git a/deploy/kubernetes/base/setup-cluster.yaml b/deploy/kubernetes/base/setup-cluster.yaml
index 331318999..83bdd23d2 100644
--- a/deploy/kubernetes/base/setup-cluster.yaml
+++ b/deploy/kubernetes/base/setup-cluster.yaml
@@ -2,21 +2,21 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-node-sa
+  name: csi-gce-pd-node-sa
 
 ---
 ##### Controller Service Account, Roles, Rolebindings
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-controller-sa
+  name: csi-gce-pd-controller-sa
 
 ---
 # xref: https://github.com/kubernetes-csi/external-provisioner/blob/master/deploy/kubernetes/rbac.yaml
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: external-provisioner-role
+  name: csi-gce-pd-provisioner-role
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -42,13 +42,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-controller-provisioner-binding
+  name: csi-gce-pd-controller-provisioner-binding
 subjects:
   - kind: ServiceAccount
-    name: csi-controller-sa
+    name: csi-gce-pd-controller-sa
 roleRef:
   kind: ClusterRole
-  name: external-provisioner-role
+  name: csi-gce-pd-provisioner-role
   apiGroup: rbac.authorization.k8s.io
   
 ---
@@ -56,7 +56,7 @@ roleRef:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: external-attacher-role
+  name: csi-gce-pd-attacher-role
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -76,13 +76,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-controller-attacher-binding
+  name: csi-gce-pd-controller-attacher-binding
 subjects:
   - kind: ServiceAccount
-    name: csi-controller-sa
+    name: csi-gce-pd-controller-sa
 roleRef:
   kind: ClusterRole
-  name: external-attacher-role
+  name: csi-gce-pd-attacher-role
   apiGroup: rbac.authorization.k8s.io
 
 ---
@@ -90,7 +90,7 @@ roleRef:
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
-  name: gce-pd-csi-driver-controller
+  name: csi-gce-pd-controller
 value: 900000000
 globalDefault: false
 description: "This priority class should be used for the GCE PD CSI driver controller deployment only."
@@ -100,7 +100,7 @@ description: "This priority class should be used for the GCE PD CSI driver contr
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
-  name: gce-pd-csi-driver-node
+  name: csi-gce-pd-node
 value: 900001000
 globalDefault: false
 description: "This priority class should be used for the GCE PD CSI driver node deployment only."
diff --git a/deploy/kubernetes/overlays/alpha/kustomization.yaml b/deploy/kubernetes/overlays/alpha/kustomization.yaml
index 8c8747b15..d300fd578 100644
--- a/deploy/kubernetes/overlays/alpha/kustomization.yaml
+++ b/deploy/kubernetes/overlays/alpha/kustomization.yaml
@@ -10,7 +10,7 @@ patchesJson6902:
     group: rbac.authorization.k8s.io
     version: v1
     kind: ClusterRole
-    name: external-provisioner-role
+    name: csi-gce-pd-provisioner-role
   path: rbac_add_snapshots_to_provisioner.yaml
 resources:
 - rbac_add_snapshotter.yaml
diff --git a/deploy/kubernetes/overlays/alpha/rbac_add_resizer.yaml b/deploy/kubernetes/overlays/alpha/rbac_add_resizer.yaml
index 5f2ee304a..ec1031cf1 100644
--- a/deploy/kubernetes/overlays/alpha/rbac_add_resizer.yaml
+++ b/deploy/kubernetes/overlays/alpha/rbac_add_resizer.yaml
@@ -2,7 +2,7 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: external-resizer-role
+  name: csi-gce-pd-resizer-role
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -21,11 +21,11 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-controller-resizer-binding
+  name: csi-gce-pd-controller-resizer-binding
 subjects:
   - kind: ServiceAccount
-    name: csi-controller-sa
+    name: csi-gce-pd-controller-sa
 roleRef:
   kind: ClusterRole
-  name: external-resizer-role
+  name: csi-gce-pd-resizer-role
   apiGroup: rbac.authorization.k8s.io
diff --git a/deploy/kubernetes/overlays/alpha/rbac_add_snapshotter.yaml b/deploy/kubernetes/overlays/alpha/rbac_add_snapshotter.yaml
index 90f678bb6..8c1d0d25b 100644
--- a/deploy/kubernetes/overlays/alpha/rbac_add_snapshotter.yaml
+++ b/deploy/kubernetes/overlays/alpha/rbac_add_snapshotter.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: external-snapshotter-role
+  name: csi-gce-pd-snapshotter-role
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -38,11 +38,11 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-controller-snapshotter-binding
+  name: csi-gce-pd-controller-snapshotter-binding
 subjects:
   - kind: ServiceAccount
-    name: csi-controller-sa
+    name: csi-gce-pd-controller-sa
 roleRef:
   kind: ClusterRole
-  name: external-snapshotter-role
+  name: csi-gce-pd-snapshotter-role
   apiGroup: rbac.authorization.k8s.io