diff --git a/internal/csi-common/controllerserver-default.go b/internal/csi-common/controllerserver-default.go
index 4115f330a..e661bf1dd 100644
--- a/internal/csi-common/controllerserver-default.go
+++ b/internal/csi-common/controllerserver-default.go
@@ -62,7 +62,7 @@ func (cs *DefaultControllerServer) ControllerGetCapabilities(ctx context.Context
 	util.TraceLog(ctx, "Using default ControllerGetCapabilities")
 
 	return &csi.ControllerGetCapabilitiesResponse{
-		Capabilities: cs.Driver.cap,
+		Capabilities: cs.Driver.capabilities,
 	}, nil
 }
 
diff --git a/internal/csi-common/driver.go b/internal/csi-common/driver.go
index e6e9dfc0d..08d1b0a1d 100644
--- a/internal/csi-common/driver.go
+++ b/internal/csi-common/driver.go
@@ -33,9 +33,9 @@ type CSIDriver struct {
 	nodeID  string
 	version string
 	// topology constraints that this nodeserver will advertise
-	topology map[string]string
-	cap      []*csi.ControllerServiceCapability
-	vc       []*csi.VolumeCapability_AccessMode
+	topology     map[string]string
+	capabilities []*csi.ControllerServiceCapability
+	vc           []*csi.VolumeCapability_AccessMode
 }
 
 // NewCSIDriver Creates a NewCSIDriver object. Assumes vendor
@@ -73,7 +73,7 @@ func (d *CSIDriver) ValidateControllerServiceRequest(c csi.ControllerServiceCapa
 		return nil
 	}
 
-	for _, capability := range d.cap {
+	for _, capability := range d.capabilities {
 		if c == capability.GetRpc().GetType() {
 			return nil
 		}
@@ -91,7 +91,7 @@ func (d *CSIDriver) AddControllerServiceCapabilities(cl []csi.ControllerServiceC
 		csc = append(csc, NewControllerServiceCapability(c))
 	}
 
-	d.cap = csc
+	d.capabilities = csc
 }
 
 // AddVolumeCapabilityAccessModes stores volume access modes.