diff --git a/cluster/addons/storage-class/aws/default.yaml b/cluster/addons/storage-class/aws/default.yaml
index 4ec88ff25d6..defd7cd73bb 100644
--- a/cluster/addons/storage-class/aws/default.yaml
+++ b/cluster/addons/storage-class/aws/default.yaml
@@ -1,7 +1,7 @@
 apiVersion: storage.k8s.io/v1beta1
 kind: StorageClass
 metadata:
-  name: default
+  name: gp2
   annotations:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
diff --git a/cluster/addons/storage-class/azure/default.yaml b/cluster/addons/storage-class/azure/default.yaml
index bcc7a33a72a..fb24e0e009e 100644
--- a/cluster/addons/storage-class/azure/default.yaml
+++ b/cluster/addons/storage-class/azure/default.yaml
@@ -1,7 +1,7 @@
 apiVersion: storage.k8s.io/v1beta1
 kind: StorageClass
 metadata:
-  name: default
+  name: standard
   annotations:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
diff --git a/cluster/addons/storage-class/gce/default.yaml b/cluster/addons/storage-class/gce/default.yaml
index f728de1fb5a..7a00fd03957 100644
--- a/cluster/addons/storage-class/gce/default.yaml
+++ b/cluster/addons/storage-class/gce/default.yaml
@@ -1,7 +1,7 @@
 apiVersion: storage.k8s.io/v1beta1
 kind: StorageClass
 metadata:
-  name: default
+  name: standard
   annotations:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
diff --git a/cluster/addons/storage-class/openstack/default.yaml b/cluster/addons/storage-class/openstack/default.yaml
index 06edf513455..2fe85cd50f4 100644
--- a/cluster/addons/storage-class/openstack/default.yaml
+++ b/cluster/addons/storage-class/openstack/default.yaml
@@ -1,7 +1,7 @@
 apiVersion: storage.k8s.io/v1beta1
 kind: StorageClass
 metadata:
-  name: default
+  name: standard
   annotations:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
diff --git a/cluster/addons/storage-class/vsphere/default.yaml b/cluster/addons/storage-class/vsphere/default.yaml
index 0c0d4bb466e..288c541165f 100644
--- a/cluster/addons/storage-class/vsphere/default.yaml
+++ b/cluster/addons/storage-class/vsphere/default.yaml
@@ -1,7 +1,7 @@
 apiVersion: storage.k8s.io/v1beta1
 kind: StorageClass
 metadata:
-  name: default
+  name: thin
   annotations:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels: