diff --git a/pkg/apis/kops/util/taints.go b/pkg/apis/kops/util/taints.go
index 4ead2959d9..a1fdd245e5 100644
--- a/pkg/apis/kops/util/taints.go
+++ b/pkg/apis/kops/util/taints.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 )
 
-// parseTaint takes a string and returns a map of its value
+// ParseTaint takes a string and returns a map of its value
 // it mimics the function from https://github.com/kubernetes/kubernetes/blob/master/pkg/util/taints/taints.go
 // but returns a map instead of a v1.Taint
 func ParseTaint(st string) (map[string]string, error) {
diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go
index 1a37ddd30c..4b0f123ae1 100644
--- a/pkg/model/awsmodel/autoscalinggroup.go
+++ b/pkg/model/awsmodel/autoscalinggroup.go
@@ -398,7 +398,7 @@ func (b *AutoscalingGroupModelBuilder) buildSecurityGroups(c *fi.CloudupModelBui
 	return securityGroups, nil
 }
 
-// buildAutoscalingGroupTask is responsible for building the autoscaling task into the model
+// buildAutoScalingGroupTask is responsible for building the autoscaling task into the model
 func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.CloudupModelBuilderContext, name string, ig *kops.InstanceGroup) (*awstasks.AutoscalingGroup, error) {
 	t := &awstasks.AutoscalingGroup{
 		Name:      fi.PtrTo(name),
diff --git a/pkg/resources/aws/filters.go b/pkg/resources/aws/filters.go
index 875c072607..c4e58e0e82 100644
--- a/pkg/resources/aws/filters.go
+++ b/pkg/resources/aws/filters.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 )
 
-// buildEc2FiltersForCluster returns the set of filters we must use to find all resources
+// buildEC2FiltersForCluster returns the set of filters we must use to find all resources
 func buildEC2FiltersForCluster(clusterName string) [][]ec2types.Filter {
 	var filterSets [][]ec2types.Filter
 
diff --git a/protokube/pkg/gossip/dns/provider/zone.go b/protokube/pkg/gossip/dns/provider/zone.go
index 326c5efbdd..b93431a2a7 100644
--- a/protokube/pkg/gossip/dns/provider/zone.go
+++ b/protokube/pkg/gossip/dns/provider/zone.go
@@ -42,7 +42,7 @@ func (z *zone) ID() string {
 	return "gossip:" + z.zoneInfo.Name
 }
 
-// ResourceRecordsets returns the provider's ResourceRecordSets interface, or false if not supported.
+// ResourceRecordSets returns the provider's ResourceRecordSets interface, or false if not supported.
 func (z *zone) ResourceRecordSets() (dnsprovider.ResourceRecordSets, bool) {
 	return &resourceRecordSets{
 		zone: z,
diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
index 2af4c894a2..cf7ae5bd25 100644
--- a/upup/pkg/fi/cloudup/template_functions.go
+++ b/upup/pkg/fi/cloudup/template_functions.go
@@ -896,7 +896,7 @@ func (tf *TemplateFunctions) KopsControllerEnv() []corev1.EnvVar {
 	return envMap.ToEnvVars()
 }
 
-// OpenStackCCM returns OpenStack external cloud controller manager current image
+// OpenStackCCMTag returns OpenStack external cloud controller manager current image
 // with tag specified to k8s version
 func (tf *TemplateFunctions) OpenStackCCMTag() string {
 	var tag string
@@ -918,7 +918,7 @@ func (tf *TemplateFunctions) OpenStackCCMTag() string {
 	return tag
 }
 
-// OpenStackCSI returns OpenStack csi current image
+// OpenStackCSITag returns OpenStack csi current image
 // with tag specified to k8s version
 func (tf *TemplateFunctions) OpenStackCSITag() string {
 	var tag string