diff --git a/integrationtests/utils.go b/integrationtests/utils.go
index d2a8255b..c6f2bfa7 100644
--- a/integrationtests/utils.go
+++ b/integrationtests/utils.go
@@ -194,15 +194,15 @@ func volumeInit(volumeClient volume.Interface, t *testing.T) (*VirtualHardDisk,
 		t.Fatalf("List response: %v", err)
 	}
 
-	volumeIDsLen := len(listResponse.VolumeIds)
+	volumeIDsLen := len(listResponse.VolumeIDs)
 	if volumeIDsLen != 1 {
 		t.Fatalf("Number of volumes not equal to 1: %d", volumeIDsLen)
 	}
-	volumeID := listResponse.VolumeIds[0]
-	t.Logf("VolumeId %v", volumeID)
+	volumeID := listResponse.VolumeIDs[0]
+	t.Logf("VolumeID %v", volumeID)
 
 	isVolumeFormattedRequest := &volume.IsVolumeFormattedRequest{
-		VolumeId: volumeID,
+		VolumeID: volumeID,
 	}
 	isVolumeFormattedResponse, err := volumeClient.IsVolumeFormatted(context.TODO(), isVolumeFormattedRequest)
 	if err != nil {
@@ -213,7 +213,7 @@ func volumeInit(volumeClient volume.Interface, t *testing.T) (*VirtualHardDisk,
 	}
 
 	formatVolumeRequest := &volume.FormatVolumeRequest{
-		VolumeId: volumeID,
+		VolumeID: volumeID,
 	}
 	_, err = volumeClient.FormatVolume(context.TODO(), formatVolumeRequest)
 	if err != nil {
diff --git a/integrationtests/volume_test.go b/integrationtests/volume_test.go
index 504d9b92..f25817a3 100644
--- a/integrationtests/volume_test.go
+++ b/integrationtests/volume_test.go
@@ -54,7 +54,7 @@ func runNegativeListVolumeRequest(t *testing.T, client volume.Interface, diskNum
 
 func runNegativeIsVolumeFormattedRequest(t *testing.T, client volume.Interface, volumeID string) {
 	isVolumeFormattedRequest := &volume.IsVolumeFormattedRequest{
-		VolumeId: volumeID,
+		VolumeID: volumeID,
 	}
 	_, err := client.IsVolumeFormatted(context.TODO(), isVolumeFormattedRequest)
 	if err == nil {
@@ -64,7 +64,7 @@ func runNegativeIsVolumeFormattedRequest(t *testing.T, client volume.Interface,
 
 func runNegativeFormatVolumeRequest(t *testing.T, client volume.Interface, volumeID string) {
 	formatVolumeRequest := &volume.FormatVolumeRequest{
-		VolumeId: volumeID,
+		VolumeID: volumeID,
 	}
 	_, err := client.FormatVolume(context.TODO(), formatVolumeRequest)
 	if err == nil {
@@ -74,7 +74,7 @@ func runNegativeFormatVolumeRequest(t *testing.T, client volume.Interface, volum
 
 func runNegativeResizeVolumeRequest(t *testing.T, client volume.Interface, volumeID string, size int64) {
 	resizeVolumeRequest := &volume.ResizeVolumeRequest{
-		VolumeId:  volumeID,
+		VolumeID:  volumeID,
 		SizeBytes: size,
 	}
 	_, err := client.ResizeVolume(context.TODO(), resizeVolumeRequest)
@@ -86,7 +86,7 @@ func runNegativeResizeVolumeRequest(t *testing.T, client volume.Interface, volum
 func runNegativeMountVolumeRequest(t *testing.T, client volume.Interface, volumeID, targetPath string) {
 	// Mount the volume
 	mountVolumeRequest := &volume.MountVolumeRequest{
-		VolumeId:   volumeID,
+		VolumeID:   volumeID,
 		TargetPath: targetPath,
 	}
 
@@ -99,7 +99,7 @@ func runNegativeMountVolumeRequest(t *testing.T, client volume.Interface, volume
 func runNegativeUnmountVolumeRequest(t *testing.T, client volume.Interface, volumeID, targetPath string) {
 	// Unmount the volume
 	unmountVolumeRequest := &volume.UnmountVolumeRequest{
-		VolumeId:   volumeID,
+		VolumeID:   volumeID,
 		TargetPath: targetPath,
 	}
 	_, err := client.UnmountVolume(context.TODO(), unmountVolumeRequest)
@@ -111,7 +111,7 @@ func runNegativeUnmountVolumeRequest(t *testing.T, client volume.Interface, volu
 func runNegativeVolumeStatsRequest(t *testing.T, client volume.Interface, volumeID string) {
 	// Get VolumeStats
 	volumeStatsRequest := &volume.GetVolumeStatsRequest{
-		VolumeId: volumeID,
+		VolumeID: volumeID,
 	}
 	_, err := client.GetVolumeStats(context.TODO(), volumeStatsRequest)
 	if err == nil {
@@ -169,7 +169,7 @@ func getClosestVolumeFromTargetPathTests(diskClient disk.Interface, volumeClient
 		}
 		cDriveVolume := strings.TrimSpace(string(targetb))
 
-		if response.VolumeId != cDriveVolume {
+		if response.VolumeID != cDriveVolume {
 			t.Fatalf("The volume from GetClosestVolumeIDFromTargetPath doesn't match the C: drive volume")
 		}
 	})
@@ -180,7 +180,7 @@ func getClosestVolumeFromTargetPathTests(diskClient disk.Interface, volumeClient
 
 		// Mount the volume
 		mountVolumeRequest := &volume.MountVolumeRequest{
-			VolumeId:   volumeID,
+			VolumeID:   volumeID,
 			TargetPath: vhd.Mount,
 		}
 		_, err = volumeClient.MountVolume(context.TODO(), mountVolumeRequest)
@@ -191,7 +191,7 @@ func getClosestVolumeFromTargetPathTests(diskClient disk.Interface, volumeClient
 		// Unmount the volume
 		defer func() {
 			unmountVolumeRequest := &volume.UnmountVolumeRequest{
-				VolumeId:   volumeID,
+				VolumeID:   volumeID,
 				TargetPath: vhd.Mount,
 			}
 			_, err = volumeClient.UnmountVolume(context.TODO(), unmountVolumeRequest)
@@ -215,7 +215,7 @@ func getClosestVolumeFromTargetPathTests(diskClient disk.Interface, volumeClient
 			t.Fatalf("GetClosestVolumeIDFromTargetPath request error, err=%v", err)
 		}
 
-		if response.VolumeId != volumeID {
+		if response.VolumeID != volumeID {
 			t.Fatalf("The volume from GetClosestVolumeIDFromTargetPath doesn't match the VHD volume=%s", volumeID)
 		}
 	})
@@ -227,7 +227,7 @@ func getClosestVolumeFromTargetPathTests(diskClient disk.Interface, volumeClient
 
 		// Mount the volume
 		mountVolumeRequest := &volume.MountVolumeRequest{
-			VolumeId:   volumeID,
+			VolumeID:   volumeID,
 			TargetPath: vhd.Mount,
 		}
 		_, err = volumeClient.MountVolume(context.TODO(), mountVolumeRequest)
@@ -238,7 +238,7 @@ func getClosestVolumeFromTargetPathTests(diskClient disk.Interface, volumeClient
 		// Unmount the volume
 		defer func() {
 			unmountVolumeRequest := &volume.UnmountVolumeRequest{
-				VolumeId:   volumeID,
+				VolumeID:   volumeID,
 				TargetPath: vhd.Mount,
 			}
 			_, err = volumeClient.UnmountVolume(context.TODO(), unmountVolumeRequest)
@@ -270,7 +270,7 @@ func getClosestVolumeFromTargetPathTests(diskClient disk.Interface, volumeClient
 			t.Fatalf("GetClosestVolumeIDFromTargetPath request error, err=%v", err)
 		}
 
-		if response.VolumeId != volumeID {
+		if response.VolumeID != volumeID {
 			t.Fatalf("The volume from GetClosestVolumeIDFromTargetPath doesn't match the VHD volume=%s", volumeID)
 		}
 	})
@@ -281,7 +281,7 @@ func mountVolumeTests(diskClient disk.Interface, volumeClient volume.Interface,
 	defer vhdCleanup()
 
 	volumeStatsRequest := &volume.GetVolumeStatsRequest{
-		VolumeId: volumeID,
+		VolumeID: volumeID,
 	}
 
 	volumeStatsResponse, err := volumeClient.GetVolumeStats(context.TODO(), volumeStatsRequest)
@@ -313,7 +313,7 @@ func mountVolumeTests(diskClient disk.Interface, volumeClient volume.Interface,
 	//    	"SizeMax":  2130689536
 	//    }
 	resizeVolumeRequest := &volume.ResizeVolumeRequest{
-		VolumeId: volumeID,
+		VolumeID: volumeID,
 		// resize the partition to 1.5x times instead
 		SizeBytes: newVolumeSize,
 	}
@@ -335,7 +335,7 @@ func mountVolumeTests(diskClient disk.Interface, volumeClient volume.Interface,
 	}
 
 	volumeDiskNumberRequest := &volume.GetDiskNumberFromVolumeIDRequest{
-		VolumeId: volumeID,
+		VolumeID: volumeID,
 	}
 
 	volumeDiskNumberResponse, err := volumeClient.GetDiskNumberFromVolumeID(context.TODO(), volumeDiskNumberRequest)
@@ -358,7 +358,7 @@ func mountVolumeTests(diskClient disk.Interface, volumeClient volume.Interface,
 
 	// Mount the volume
 	mountVolumeRequest := &volume.MountVolumeRequest{
-		VolumeId:   volumeID,
+		VolumeID:   volumeID,
 		TargetPath: vhd.Mount,
 	}
 	_, err = volumeClient.MountVolume(context.TODO(), mountVolumeRequest)
@@ -368,7 +368,7 @@ func mountVolumeTests(diskClient disk.Interface, volumeClient volume.Interface,
 
 	// Unmount the volume
 	unmountVolumeRequest := &volume.UnmountVolumeRequest{
-		VolumeId:   volumeID,
+		VolumeID:   volumeID,
 		TargetPath: vhd.Mount,
 	}
 	_, err = volumeClient.UnmountVolume(context.TODO(), unmountVolumeRequest)
diff --git a/pkg/volume/types.go b/pkg/volume/types.go
index 1754dd00..78430be8 100644
--- a/pkg/volume/types.go
+++ b/pkg/volume/types.go
@@ -10,12 +10,12 @@ type ListVolumesOnDiskRequest struct {
 
 type ListVolumesOnDiskResponse struct {
 	// Volume device IDs of volumes on the specified disk
-	VolumeIds []string
+	VolumeIDs []string
 }
 
 type MountVolumeRequest struct {
 	// Volume device ID of the volume to mount
-	VolumeId string
+	VolumeID string
 
 	// Path in the host's file system where the volume needs to be mounted
 	TargetPath string
@@ -27,7 +27,7 @@ type MountVolumeResponse struct {
 
 type IsVolumeFormattedRequest struct {
 	// Volume device ID of the volume to check
-	VolumeId string
+	VolumeID string
 }
 
 type IsVolumeFormattedResponse struct {
@@ -37,7 +37,7 @@ type IsVolumeFormattedResponse struct {
 
 type FormatVolumeRequest struct {
 	// Volume device ID of the volume to format
-	VolumeId string
+	VolumeID string
 }
 
 type FormatVolumeResponse struct {
@@ -46,7 +46,7 @@ type FormatVolumeResponse struct {
 
 type WriteVolumeCacheRequest struct {
 	// Volume device ID of the volume to flush the cache
-	VolumeId string
+	VolumeID string
 }
 
 type WriteVolumeCacheResponse struct {
@@ -55,7 +55,7 @@ type WriteVolumeCacheResponse struct {
 
 type UnmountVolumeRequest struct {
 	// Volume device ID of the volume to dismount
-	VolumeId string
+	VolumeID string
 
 	// Path where the volume has been mounted
 	TargetPath string
@@ -67,7 +67,7 @@ type UnmountVolumeResponse struct {
 
 type ResizeVolumeRequest struct {
 	// Volume device ID of the volume to resize
-	VolumeId string
+	VolumeID string
 
 	// New size in bytes of the volume
 	SizeBytes int64
@@ -79,7 +79,7 @@ type ResizeVolumeResponse struct {
 
 type GetVolumeStatsRequest struct {
 	// Volume device Id of the volume to get the stats for
-	VolumeId string
+	VolumeID string
 }
 
 type GetVolumeStatsResponse struct {
@@ -92,7 +92,7 @@ type GetVolumeStatsResponse struct {
 
 type GetDiskNumberFromVolumeIDRequest struct {
 	// Volume device ID of the volume to get the disk number for
-	VolumeId string
+	VolumeID string
 }
 
 type GetDiskNumberFromVolumeIDResponse struct {
@@ -107,7 +107,7 @@ type GetVolumeIDFromTargetPathRequest struct {
 
 type GetVolumeIDFromTargetPathResponse struct {
 	// The volume device ID
-	VolumeId string
+	VolumeID string
 }
 
 type GetClosestVolumeIDFromTargetPathRequest struct {
@@ -117,5 +117,5 @@ type GetClosestVolumeIDFromTargetPathRequest struct {
 
 type GetClosestVolumeIDFromTargetPathResponse struct {
 	// The volume device ID
-	VolumeId string
+	VolumeID string
 }
diff --git a/pkg/volume/volume.go b/pkg/volume/volume.go
index 26fdf251..3cbbebf2 100644
--- a/pkg/volume/volume.go
+++ b/pkg/volume/volume.go
@@ -69,7 +69,7 @@ func (v *Volume) ListVolumesOnDisk(context context.Context, request *ListVolumes
 		return response, err
 	}
 
-	response.VolumeIds = volumeIDs
+	response.VolumeIDs = volumeIDs
 	return response, nil
 }
 
@@ -77,10 +77,10 @@ func (v *Volume) MountVolume(context context.Context, request *MountVolumeReques
 	klog.V(2).Infof("MountVolume: Request: %+v", request)
 	response := &MountVolumeResponse{}
 
-	volumeID := request.VolumeId
+	volumeID := request.VolumeID
 	if volumeID == "" {
 		klog.Errorf("volume id empty")
-		return response, fmt.Errorf("MountVolumeRequest.VolumeId is empty")
+		return response, fmt.Errorf("MountVolumeRequest.VolumeID is empty")
 	}
 	targetPath := request.TargetPath
 	if targetPath == "" {
@@ -100,7 +100,7 @@ func (v *Volume) UnmountVolume(context context.Context, request *UnmountVolumeRe
 	klog.V(2).Infof("UnmountVolume: Request: %+v", request)
 	response := &UnmountVolumeResponse{}
 
-	volumeID := request.VolumeId
+	volumeID := request.VolumeID
 	if volumeID == "" {
 		klog.Errorf("volume id empty")
 		return response, fmt.Errorf("volume id empty")
@@ -122,7 +122,7 @@ func (v *Volume) IsVolumeFormatted(context context.Context, request *IsVolumeFor
 	klog.V(2).Infof("IsVolumeFormatted: Request: %+v", request)
 	response := &IsVolumeFormattedResponse{}
 
-	volumeID := request.VolumeId
+	volumeID := request.VolumeID
 	if volumeID == "" {
 		klog.Errorf("volume id empty")
 		return response, fmt.Errorf("volume id empty")
@@ -141,7 +141,7 @@ func (v *Volume) FormatVolume(context context.Context, request *FormatVolumeRequ
 	klog.V(2).Infof("FormatVolume: Request: %+v", request)
 	response := &FormatVolumeResponse{}
 
-	volumeID := request.VolumeId
+	volumeID := request.VolumeID
 	if volumeID == "" {
 		klog.Errorf("volume id empty")
 		return response, fmt.Errorf("volume id empty")
@@ -159,7 +159,7 @@ func (v *Volume) WriteVolumeCache(context context.Context, request *WriteVolumeC
 	klog.V(2).Infof("WriteVolumeCache: Request: %+v", request)
 	response := &WriteVolumeCacheResponse{}
 
-	volumeID := request.VolumeId
+	volumeID := request.VolumeID
 	if volumeID == "" {
 		klog.Errorf("volume id empty")
 		return response, fmt.Errorf("volume id empty")
@@ -177,7 +177,7 @@ func (v *Volume) ResizeVolume(context context.Context, request *ResizeVolumeRequ
 	klog.V(2).Infof("ResizeVolume: Request: %+v", request)
 	response := &ResizeVolumeResponse{}
 
-	volumeID := request.VolumeId
+	volumeID := request.VolumeID
 	if volumeID == "" {
 		klog.Errorf("volume id empty")
 		return response, fmt.Errorf("volume id empty")
@@ -195,7 +195,7 @@ func (v *Volume) ResizeVolume(context context.Context, request *ResizeVolumeRequ
 
 func (v *Volume) GetVolumeStats(context context.Context, request *GetVolumeStatsRequest) (*GetVolumeStatsResponse, error) {
 	klog.V(2).Infof("GetVolumeStats: Request: %+v", request)
-	volumeID := request.VolumeId
+	volumeID := request.VolumeID
 	if volumeID == "" {
 		return nil, fmt.Errorf("volume id empty")
 	}
@@ -219,12 +219,12 @@ func (v *Volume) GetVolumeStats(context context.Context, request *GetVolumeStats
 func (v *Volume) GetDiskNumberFromVolumeID(context context.Context, request *GetDiskNumberFromVolumeIDRequest) (*GetDiskNumberFromVolumeIDResponse, error) {
 	klog.V(2).Infof("GetDiskNumberFromVolumeID: Request: %+v", request)
 
-	volumeId := request.VolumeId
-	if volumeId == "" {
+	volumeID := request.VolumeID
+	if volumeID == "" {
 		return nil, fmt.Errorf("volume id empty")
 	}
 
-	diskNumber, err := v.hostAPI.GetDiskNumberFromVolumeID(volumeId)
+	diskNumber, err := v.hostAPI.GetDiskNumberFromVolumeID(volumeID)
 	if err != nil {
 		klog.Errorf("failed GetDiskNumberFromVolumeID %v", err)
 		return nil, err
@@ -252,7 +252,7 @@ func (v *Volume) GetVolumeIDFromTargetPath(context context.Context, request *Get
 	}
 
 	response := &GetVolumeIDFromTargetPathResponse{
-		VolumeId: volume,
+		VolumeID: volume,
 	}
 
 	return response, nil
@@ -273,7 +273,7 @@ func (v *Volume) GetClosestVolumeIDFromTargetPath(context context.Context, reque
 	}
 
 	response := &GetClosestVolumeIDFromTargetPathResponse{
-		VolumeId: volume,
+		VolumeID: volume,
 	}
 
 	return response, nil
diff --git a/pkg/volume/volume_test.go b/pkg/volume/volume_test.go
index 3c4ddf5e..5032b653 100644
--- a/pkg/volume/volume_test.go
+++ b/pkg/volume/volume_test.go
@@ -72,28 +72,28 @@ func TestListVolumesOnDisk(t *testing.T) {
 	testCases := []struct {
 		name              string
 		inputDiskNumber   uint32
-		expectedVolumeIds []string
+		expectedVolumeIDs []string
 		isErrorExpected   bool
 		expectedError     error
 	}{
 		{
 			name:              "return two volumeIDs",
 			inputDiskNumber:   1,
-			expectedVolumeIds: []string{"volumeID1", "volumeID2"},
+			expectedVolumeIDs: []string{"volumeID1", "volumeID2"},
 			isErrorExpected:   false,
 			expectedError:     nil,
 		},
 		{
 			name:              "return one volumeIDs",
 			inputDiskNumber:   2,
-			expectedVolumeIds: []string{"volumeID3"},
+			expectedVolumeIDs: []string{"volumeID3"},
 			isErrorExpected:   false,
 			expectedError:     nil,
 		},
 		{
 			name:              "return error",
 			inputDiskNumber:   3,
-			expectedVolumeIds: nil,
+			expectedVolumeIDs: nil,
 			isErrorExpected:   true,
 			expectedError:     fmt.Errorf("returning error for 3 list"),
 		},
@@ -129,10 +129,10 @@ func TestListVolumesOnDisk(t *testing.T) {
 			}
 
 			expectedVolumeIDMap := make(map[string]int)
-			for _, j := range tc.expectedVolumeIds {
+			for _, j := range tc.expectedVolumeIDs {
 				expectedVolumeIDMap[j] = 0
 			}
-			for _, i := range volumeListResponse.VolumeIds {
+			for _, i := range volumeListResponse.VolumeIDs {
 				if _, found := expectedVolumeIDMap[i]; found == true {
 					expectedVolumeIDMap[i]++
 				} else {