diff --git a/deploy/kubernetes/controller.yaml b/deploy/kubernetes/controller.yaml
index c87d706470..d1a6bcd535 100644
--- a/deploy/kubernetes/controller.yaml
+++ b/deploy/kubernetes/controller.yaml
@@ -108,15 +108,15 @@ roleRef:
 kind: StatefulSet
 apiVersion: apps/v1beta1
 metadata:
-  name: csi-controller
+  name: ebs-csi-controller
   namespace: kube-system
 spec:
-  serviceName: csi-controller
+  serviceName: ebs-csi-controller
   replicas: 1
   template:
     metadata:
       labels:
-        app: csi-controller
+        app: ebs-csi-controller
     spec:
       serviceAccount: csi-controller-sa
       priorityClassName: system-cluster-critical
@@ -196,4 +196,4 @@ spec:
         - name: registration-dir
           hostPath:
             path: /var/lib/kubelet/plugins_registry/
-            type: Directory
\ No newline at end of file
+            type: Directory
diff --git a/deploy/kubernetes/node.yaml b/deploy/kubernetes/node.yaml
index e49010864c..031d5c8798 100644
--- a/deploy/kubernetes/node.yaml
+++ b/deploy/kubernetes/node.yaml
@@ -1,16 +1,16 @@
 kind: DaemonSet
 apiVersion: apps/v1beta2
 metadata:
-  name: csi-node
+  name: ebs-csi-node
   namespace: kube-system
 spec:
   selector:
     matchLabels:
-      app: csi-node
+      app: ebs-csi-node
   template:
     metadata:
       labels:
-        app: csi-node
+        app: ebs-csi-node
     spec:
       hostNetwork: true
       priorityClassName: system-node-critical
@@ -30,16 +30,6 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
-            - name: AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: aws-secret
-                  key: key_id
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: aws-secret
-                  key: access_key
           volumeMounts:
             - name: kubelet-dir
               mountPath: /var/lib/kubelet
diff --git a/deploy/kubernetes/sample_app/claim.yaml b/deploy/kubernetes/sample_app/claim.yaml
index df798abf34..a883baa530 100644
--- a/deploy/kubernetes/sample_app/claim.yaml
+++ b/deploy/kubernetes/sample_app/claim.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: claim1
+  name: ebs-claim
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: slow
+  storageClassName: ebs-sc
   resources:
     requests:
       storage: 4Gi
diff --git a/deploy/kubernetes/sample_app/pod.yaml b/deploy/kubernetes/sample_app/pod.yaml
index 9ba86729ca..f274015916 100644
--- a/deploy/kubernetes/sample_app/pod.yaml
+++ b/deploy/kubernetes/sample_app/pod.yaml
@@ -14,4 +14,4 @@ spec:
   volumes:
   - name: persistent-storage
     persistentVolumeClaim:
-      claimName: claim1
+      claimName: ebs-claim
diff --git a/deploy/kubernetes/sample_app/storageclass.yaml b/deploy/kubernetes/sample_app/storageclass.yaml
index ef849d313b..d6e168e1ec 100644
--- a/deploy/kubernetes/sample_app/storageclass.yaml
+++ b/deploy/kubernetes/sample_app/storageclass.yaml
@@ -1,8 +1,6 @@
 kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
-  name: slow
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
+  name: ebs-sc
 provisioner: ebs.csi.aws.com
-volumeBindingMode: WaitForFirstConsumer
\ No newline at end of file
+volumeBindingMode: WaitForFirstConsumer