diff --git a/pkg/apis/kops/status.go b/pkg/apis/kops/status.go
index 79c94d8ebc..d1912d0e77 100644
--- a/pkg/apis/kops/status.go
+++ b/pkg/apis/kops/status.go
@@ -33,6 +33,6 @@ type EtcdMemberStatus struct {
 	// Name is the name of the member within the etcd cluster
 	Name string `json:"name,omitempty"`
 
-	// volumeId is the id of the cloud volume (e.g. the AWS volume id)
-	VolumeId string `json:"volumeId,omitempty"`
+	// VolumeID is the id of the cloud volume (e.g. the AWS volume id)
+	VolumeID string `json:"volumeID,omitempty"`
 }
diff --git a/upup/pkg/fi/cloudup/aliup/status.go b/upup/pkg/fi/cloudup/aliup/status.go
index 3cb0dcfee6..54cd2f3640 100644
--- a/upup/pkg/fi/cloudup/aliup/status.go
+++ b/upup/pkg/fi/cloudup/aliup/status.go
@@ -127,7 +127,7 @@ func findEtcdStatus(c ALICloud, cluster *kops.Cluster) ([]kops.EtcdClusterStatus
 		memberName := etcdClusterSpec.NodeName
 		status.Members = append(status.Members, &kops.EtcdMemberStatus{
 			Name:     memberName,
-			VolumeId: disk.DiskId,
+			VolumeID: disk.DiskId,
 		})
 	}
 
diff --git a/upup/pkg/fi/cloudup/awsup/status.go b/upup/pkg/fi/cloudup/awsup/status.go
index b34769d313..eeb5b91063 100644
--- a/upup/pkg/fi/cloudup/awsup/status.go
+++ b/upup/pkg/fi/cloudup/awsup/status.go
@@ -109,7 +109,7 @@ func findEtcdStatus(c AWSCloud, cluster *kops.Cluster) ([]kops.EtcdClusterStatus
 		memberName := etcdClusterSpec.NodeName
 		status.Members = append(status.Members, &kops.EtcdMemberStatus{
 			Name:     memberName,
-			VolumeId: aws.StringValue(volume.VolumeId),
+			VolumeID: aws.StringValue(volume.VolumeId),
 		})
 	}
 
diff --git a/upup/pkg/fi/cloudup/azure/status.go b/upup/pkg/fi/cloudup/azure/status.go
index bc0054b1ea..9719a755a0 100644
--- a/upup/pkg/fi/cloudup/azure/status.go
+++ b/upup/pkg/fi/cloudup/azure/status.go
@@ -90,7 +90,7 @@ func (c *azureCloudImplementation) findEtcdStatus(disks []compute.Disk) ([]kops.
 		}
 		status.Members = append(status.Members, &kops.EtcdMemberStatus{
 			Name:     etcdClusterSpec.NodeName,
-			VolumeId: *disk.Name,
+			VolumeID: *disk.Name,
 		})
 	}
 
diff --git a/upup/pkg/fi/cloudup/azure/status_test.go b/upup/pkg/fi/cloudup/azure/status_test.go
index aa3859e53a..cb24042d03 100644
--- a/upup/pkg/fi/cloudup/azure/status_test.go
+++ b/upup/pkg/fi/cloudup/azure/status_test.go
@@ -127,15 +127,15 @@ func TestFindEtcdStatus(t *testing.T) {
 	expected := map[string]*kops.EtcdMemberStatus{
 		"a": {
 			Name:     "a",
-			VolumeId: "d0",
+			VolumeID: "d0",
 		},
 		"b": {
 			Name:     "b",
-			VolumeId: "d1",
+			VolumeID: "d1",
 		},
 		"c": {
 			Name:     "c",
-			VolumeId: "d2",
+			VolumeID: "d2",
 		},
 	}
 
diff --git a/upup/pkg/fi/cloudup/do/cloud.go b/upup/pkg/fi/cloudup/do/cloud.go
index 8780f99ebf..d18b5d479d 100644
--- a/upup/pkg/fi/cloudup/do/cloud.go
+++ b/upup/pkg/fi/cloudup/do/cloud.go
@@ -320,7 +320,7 @@ func findEtcdStatus(c *doCloudImplementation, cluster *kops.Cluster) ([]kops.Etc
 						memberName := etcdClusterSpec.NodeName
 						status.Members = append(status.Members, &kops.EtcdMemberStatus{
 							Name:     memberName,
-							VolumeId: volume.ID,
+							VolumeID: volume.ID,
 						})
 					}
 				}
diff --git a/upup/pkg/fi/cloudup/gce/status.go b/upup/pkg/fi/cloudup/gce/status.go
index b78bcc434c..a9ef6faeec 100644
--- a/upup/pkg/fi/cloudup/gce/status.go
+++ b/upup/pkg/fi/cloudup/gce/status.go
@@ -131,7 +131,7 @@ func (c *gceCloudImplementation) findEtcdStatus(cluster *kops.Cluster) ([]kops.E
 
 		status.Members = append(status.Members, &kops.EtcdMemberStatus{
 			Name:     etcdClusterSpec.NodeName,
-			VolumeId: disk.Name,
+			VolumeID: disk.Name,
 		})
 	}
 
diff --git a/upup/pkg/fi/cloudup/openstack/status.go b/upup/pkg/fi/cloudup/openstack/status.go
index 646ffc77a9..ddd59cead6 100644
--- a/upup/pkg/fi/cloudup/openstack/status.go
+++ b/upup/pkg/fi/cloudup/openstack/status.go
@@ -103,7 +103,7 @@ func findEtcdStatus(c OpenstackCloud, cluster *kops.Cluster) ([]kops.EtcdCluster
 		memberName := etcdClusterSpec.NodeName
 		status.Members = append(status.Members, &kops.EtcdMemberStatus{
 			Name:     memberName,
-			VolumeId: volume.ID,
+			VolumeID: volume.ID,
 		})
 	}
 	var status []kops.EtcdClusterStatus