diff --git a/internal/util/util.go b/internal/util/util.go
index 6a2e84c9..8df06223 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -63,10 +63,10 @@ func RandomString(n int) (string, error) {
 }
 
 // ReplaceString replaces all occurrences of old in slice with new.
-func ReplaceString(slice []string, old, new string) []string {
+func ReplaceString(slice []string, old, newStr string) []string {
 	for i, s := range slice {
 		if s == old {
-			slice[i] = new
+			slice[i] = newStr
 		}
 	}
 	return slice
diff --git a/plugin/cron/parser.go b/plugin/cron/parser.go
index e1607a11..d63641be 100644
--- a/plugin/cron/parser.go
+++ b/plugin/cron/parser.go
@@ -173,24 +173,24 @@ func normalizeFields(fields []string, options ParseOption) ([]string, error) {
 	}
 
 	// Figure out how many fields we need
-	max := 0
+	maximumValue := 0
 	for _, place := range places {
 		if options&place > 0 {
-			max++
+			maximumValue++
 		}
 	}
-	min := max - optionals
+	minimumValue := maximumValue - optionals
 
 	// Validate number of fields
-	if count := len(fields); count < min || count > max {
-		if min == max {
+	if count := len(fields); count < minimumValue || count > maximumValue {
+		if minimumValue == maximumValue {
 			return nil, errors.New("incorrect number of fields")
 		}
-		return nil, errors.New("incorrect number of fields, expected " + strconv.Itoa(min) + "-" + strconv.Itoa(max))
+		return nil, errors.New("incorrect number of fields, expected " + strconv.Itoa(minimumValue) + "-" + strconv.Itoa(maximumValue))
 	}
 
 	// Populate the optional field if not provided
-	if min < max && len(fields) == min {
+	if minimumValue < maximumValue && len(fields) == minimumValue {
 		switch {
 		case options&DowOptional > 0:
 			fields = append(fields, defaults[5]) // TODO: improve access to default
diff --git a/store/idp.go b/store/idp.go
index 6aed4bbf..996e47d5 100644
--- a/store/idp.go
+++ b/store/idp.go
@@ -131,13 +131,13 @@ func (s *Store) UpdateIdentityProvider(ctx context.Context, update *UpdateIdenti
 	return identityProvider, nil
 }
 
-func (s *Store) DeleteIdentityProvider(ctx context.Context, delete *DeleteIdentityProvider) error {
-	err := s.driver.DeleteIdentityProvider(ctx, delete)
+func (s *Store) DeleteIdentityProvider(ctx context.Context, deleteIdp *DeleteIdentityProvider) error {
+	err := s.driver.DeleteIdentityProvider(ctx, deleteIdp)
 	if err != nil {
 		return err
 	}
 
-	s.idpCache.Delete(delete.ID)
+	s.idpCache.Delete(deleteIdp.ID)
 	return nil
 }
 
diff --git a/store/memo_relation.go b/store/memo_relation.go
index 3d68049d..3072248a 100644
--- a/store/memo_relation.go
+++ b/store/memo_relation.go
@@ -39,6 +39,6 @@ func (s *Store) ListMemoRelations(ctx context.Context, find *FindMemoRelation) (
 	return s.driver.ListMemoRelations(ctx, find)
 }
 
-func (s *Store) DeleteMemoRelation(ctx context.Context, delete *DeleteMemoRelation) error {
-	return s.driver.DeleteMemoRelation(ctx, delete)
+func (s *Store) DeleteMemoRelation(ctx context.Context, deleteMR *DeleteMemoRelation) error {
+	return s.driver.DeleteMemoRelation(ctx, deleteMR)
 }
diff --git a/store/resource.go b/store/resource.go
index 71aec1db..4d784349 100644
--- a/store/resource.go
+++ b/store/resource.go
@@ -97,8 +97,8 @@ func (s *Store) UpdateResource(ctx context.Context, update *UpdateResource) erro
 	return s.driver.UpdateResource(ctx, update)
 }
 
-func (s *Store) DeleteResource(ctx context.Context, delete *DeleteResource) error {
-	resource, err := s.GetResource(ctx, &FindResource{ID: &delete.ID})
+func (s *Store) DeleteResource(ctx context.Context, deleteResource *DeleteResource) error {
+	resource, err := s.GetResource(ctx, &FindResource{ID: &deleteResource.ID})
 	if err != nil {
 		return errors.Wrap(err, "failed to get resource")
 	}
@@ -151,5 +151,5 @@ func (s *Store) DeleteResource(ctx context.Context, delete *DeleteResource) erro
 		}
 	}
 
-	return s.driver.DeleteResource(ctx, delete)
+	return s.driver.DeleteResource(ctx, deleteResource)
 }