diff --git a/scripts/k8s-storage/driver-rbd.yaml b/scripts/k8s-storage/driver-rbd.yaml
index a0827aca7..cc688c7fe 100644
--- a/scripts/k8s-storage/driver-rbd.yaml
+++ b/scripts/k8s-storage/driver-rbd.yaml
@@ -1,7 +1,7 @@
 ---
-ShortName: cephcsi-rbd-rwo-test
+ShortName: cephcsi-rbd-test
 StorageClass:
-  FromExistingClassName: k8s-storage-e2e-rbd-rwo
+  FromExistingClassName: k8s-storage-e2e-rbd
   # FromFile: sc-rbd.yaml
 
 SnapshotClass:
@@ -10,7 +10,7 @@ SnapshotClass:
 
 DriverInfo:
   # Internal name of the driver, display name in the test case and test objects
-  Name: rbd-rwo.csi.ceph.com
+  Name: rbd.csi.ceph.com
 
   # The range of disk size supported by this driver
   SupportedSizeRange:
diff --git a/scripts/k8s-storage/sc-rbd.yaml.in b/scripts/k8s-storage/sc-rbd.yaml.in
index c3d09d161..c207aa0f5 100644
--- a/scripts/k8s-storage/sc-rbd.yaml.in
+++ b/scripts/k8s-storage/sc-rbd.yaml.in
@@ -2,7 +2,7 @@
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-   name: k8s-storage-e2e-rbd-rwo
+   name: k8s-storage-e2e-rbd
 provisioner: rbd.csi.ceph.com
 parameters:
    clusterID: @@CLUSTER_ID@@