diff --git a/internal/cldrtree/option.go b/internal/cldrtree/option.go
index f91e250b..33b6103b 100644
--- a/internal/cldrtree/option.go
+++ b/internal/cldrtree/option.go
@@ -29,7 +29,7 @@ func (o *options) fill(opt []Option) {
 	}
 }
 
-// aliasOpt sets an alias from the given node, if the node defines one.
+// setAlias sets an alias from the given node, if the node defines one.
 func (o *options) setAlias(n Element) {
 	if n != nil && !reflect.ValueOf(n).IsNil() {
 		o.alias = n.GetCommon()
diff --git a/internal/language/compact/language.go b/internal/language/compact/language.go
index 83816a72..8c1b6666 100644
--- a/internal/language/compact/language.go
+++ b/internal/language/compact/language.go
@@ -118,7 +118,7 @@ func (t Tag) Parent() Tag {
 	return Tag{language: lang, locale: lang}
 }
 
-// returns token t and the rest of the string.
+// nextToken returns token t and the rest of the string.
 func nextToken(s string) (t, tail string) {
 	p := strings.Index(s[1:], "-")
 	if p == -1 {
diff --git a/internal/language/gen.go b/internal/language/gen.go
index 520f1596..f0ef4b2d 100644
--- a/internal/language/gen.go
+++ b/internal/language/gen.go
@@ -1080,7 +1080,7 @@ func find(list []string, s string) int {
 	return -1
 }
 
-// writeVariants generates per-variant information and creates a map from variant
+// writeVariant generates per-variant information and creates a map from variant
 // name to index value. We assign index values such that sorting multiple
 // variants by index value will result in the correct order.
 // There are two types of variants: specialized and general. Specialized variants
diff --git a/internal/language/language.go b/internal/language/language.go
index 6105bc7f..09d41c73 100644
--- a/internal/language/language.go
+++ b/internal/language/language.go
@@ -409,7 +409,7 @@ func (t Tag) SetTypeForKey(key, value string) (Tag, error) {
 	return t, nil
 }
 
-// findKeyAndType returns the start and end position for the type corresponding
+// findTypeForKey returns the start and end position for the type corresponding
 // to key or the point at which to insert the key-value pair if the type
 // wasn't found. The hasExt return value reports whether an -u extension was present.
 // Note: the extensions are typically very small and are likely to contain
diff --git a/language/display/maketables.go b/language/display/maketables.go
index a6cbcc6d..25674bbf 100644
--- a/language/display/maketables.go
+++ b/language/display/maketables.go
@@ -528,7 +528,7 @@ func (h *header) writeSingle(w *gen.CodeWriter, name string) {
 	}
 }
 
-// WriteTable writes an entry for a single Namer.
+// writeTable writes an entry for a single Namer.
 func (g *group) writeTable(w *gen.CodeWriter, name string) {
 	start := w.Size
 	writeKeys(w, name, g.toTags)
diff --git a/language/language.go b/language/language.go
index 289b3a36..4d9c6612 100644
--- a/language/language.go
+++ b/language/language.go
@@ -344,7 +344,7 @@ func (t Tag) Parent() Tag {
 	return Tag(compact.Tag(t).Parent())
 }
 
-// returns token t and the rest of the string.
+// nextToken returns token t and the rest of the string.
 func nextToken(s string) (t, tail string) {
 	p := strings.Index(s[1:], "-")
 	if p == -1 {