diff --git a/internal/cephfs/controllerserver.go b/internal/cephfs/controllerserver.go
index 4f9a01824..72bbd21b2 100644
--- a/internal/cephfs/controllerserver.go
+++ b/internal/cephfs/controllerserver.go
@@ -373,8 +373,8 @@ func (cs *ControllerServer) ValidateVolumeCapabilities(
 	ctx context.Context,
 	req *csi.ValidateVolumeCapabilitiesRequest) (*csi.ValidateVolumeCapabilitiesResponse, error) {
 	// Cephfs doesn't support Block volume
-	for _, cap := range req.VolumeCapabilities {
-		if cap.GetBlock() != nil {
+	for _, capability := range req.VolumeCapabilities {
+		if capability.GetBlock() != nil {
 			return &csi.ValidateVolumeCapabilitiesResponse{Message: ""}, nil
 		}
 	}
diff --git a/internal/cephfs/util.go b/internal/cephfs/util.go
index 8aa8a875d..265cbb2f7 100644
--- a/internal/cephfs/util.go
+++ b/internal/cephfs/util.go
@@ -67,8 +67,8 @@ func (cs *ControllerServer) validateCreateVolumeRequest(req *csi.CreateVolumeReq
 		return status.Error(codes.InvalidArgument, "volume Capabilities cannot be empty")
 	}
 
-	for _, cap := range reqCaps {
-		if cap.GetBlock() != nil {
+	for _, capability := range reqCaps {
+		if capability.GetBlock() != nil {
 			return status.Error(codes.Unimplemented, "block volume not supported")
 		}
 	}
diff --git a/internal/csi-common/driver.go b/internal/csi-common/driver.go
index 4ef423657..e6e9dfc0d 100644
--- a/internal/csi-common/driver.go
+++ b/internal/csi-common/driver.go
@@ -73,8 +73,8 @@ func (d *CSIDriver) ValidateControllerServiceRequest(c csi.ControllerServiceCapa
 		return nil
 	}
 
-	for _, cap := range d.cap {
-		if c == cap.GetRpc().GetType() {
+	for _, capability := range d.cap {
+		if c == capability.GetRpc().GetType() {
 			return nil
 		}
 	}