diff --git a/README.md b/README.md
index ed63eeb8f9..c575ea8225 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ There are several optional parameters that could be passed into `CreateVolumeReq
 | "kmsKeyId"        |                  |          | The full ARN of the key to use when encrypting the volume. When not specified, the default KMS key is used |
 
 ### Topology
-`com.amazon.aws.csi.ebs/zone` is the only topology key that represents the availability zone of which a volume is accessible.
+`topology.ebs.csi.aws.com/zone` is the only topology key that represents the availability zone of which a volume is accessible.
 
 To enable topology support on kuberetes, make sure `CSINodeInfo` and `CSIDriverRegistry` feature flags are enabled on both kubelet and kube-apiserver and `CSINodeInfo` CRD is installed on the cluster using:
 
diff --git a/deploy/kubernetes/v1.12+/node.yaml b/deploy/kubernetes/v1.12+/node.yaml
index a2d44b3d9f..b8c9424108 100644
--- a/deploy/kubernetes/v1.12+/node.yaml
+++ b/deploy/kubernetes/v1.12+/node.yaml
@@ -81,7 +81,7 @@ spec:
             - name: ADDRESS
               value: /csi/csi.sock
             - name: DRIVER_REG_SOCK_PATH
-              value: /var/lib/kubelet/plugins/com.amazon.aws.csi.ebs/csi.sock
+              value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -128,7 +128,7 @@ spec:
             type: Directory
         - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/com.amazon.aws.csi.ebs/
+            path: /var/lib/kubelet/plugins/ebs.csi.aws.com/
             type: DirectoryOrCreate
         - name: registration-dir
           hostPath:
diff --git a/deploy/kubernetes/v1.12+/provisioner.yaml b/deploy/kubernetes/v1.12+/provisioner.yaml
index 6c84fe4694..5c7e8bc76f 100644
--- a/deploy/kubernetes/v1.12+/provisioner.yaml
+++ b/deploy/kubernetes/v1.12+/provisioner.yaml
@@ -95,7 +95,7 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/k8scsi/csi-provisioner:v0.4.1
           args:
-            - --provisioner=com.amazon.aws.csi.ebs
+            - --provisioner=ebs.csi.aws.com
             - --csi-address=$(ADDRESS)
             - --v=5
             - --feature-gates=Topology=true
diff --git a/deploy/kubernetes/v1.12+/sample_app/storageclass.yaml b/deploy/kubernetes/v1.12+/sample_app/storageclass.yaml
index 548a8a2980..57196d17aa 100644
--- a/deploy/kubernetes/v1.12+/sample_app/storageclass.yaml
+++ b/deploy/kubernetes/v1.12+/sample_app/storageclass.yaml
@@ -4,4 +4,4 @@ metadata:
   name: slow
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
-provisioner: com.amazon.aws.csi.ebs
+provisioner: ebs.csi.aws.com
diff --git a/deploy/kubernetes/v1.[10,11]/node.yaml b/deploy/kubernetes/v1.[10,11]/node.yaml
index a9bf6d0c42..84ed4a9d18 100644
--- a/deploy/kubernetes/v1.[10,11]/node.yaml
+++ b/deploy/kubernetes/v1.[10,11]/node.yaml
@@ -117,7 +117,7 @@ spec:
             type: Directory
         - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins/com.amazon.aws.csi.ebs/
+            path: /var/lib/kubelet/plugins/ebs.csi.aws.com/
             type: DirectoryOrCreate
         - name: device-dir
           hostPath:
diff --git a/deploy/kubernetes/v1.[10,11]/provisioner.yaml b/deploy/kubernetes/v1.[10,11]/provisioner.yaml
index 0992d8b12a..d48c614cb0 100644
--- a/deploy/kubernetes/v1.[10,11]/provisioner.yaml
+++ b/deploy/kubernetes/v1.[10,11]/provisioner.yaml
@@ -80,7 +80,7 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/k8scsi/csi-provisioner:v0.4.1
           args:
-            - --provisioner=com.amazon.aws.csi.ebs
+            - --provisioner=ebs.csi.aws.com
             - --csi-address=$(ADDRESS)
             - --v=5
           env:
diff --git a/deploy/kubernetes/v1.[10,11]/sample_app/storageclass.yaml b/deploy/kubernetes/v1.[10,11]/sample_app/storageclass.yaml
index 548a8a2980..57196d17aa 100644
--- a/deploy/kubernetes/v1.[10,11]/sample_app/storageclass.yaml
+++ b/deploy/kubernetes/v1.[10,11]/sample_app/storageclass.yaml
@@ -4,4 +4,4 @@ metadata:
   name: slow
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
-provisioner: com.amazon.aws.csi.ebs
+provisioner: ebs.csi.aws.com
diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go
index c0426d1e7b..98a56dbe2a 100644
--- a/pkg/driver/driver.go
+++ b/pkg/driver/driver.go
@@ -29,8 +29,8 @@ import (
 )
 
 const (
-	driverName  = "com.amazon.aws.csi.ebs"
-	topologyKey = driverName + "/zone"
+	driverName  = "ebs.csi.aws.com"
+	topologyKey = "topology." + driverName + "/zone"
 )
 
 var (