diff --git a/v2/codegen/apigen/endpointgen/request.go b/v2/codegen/apigen/endpointgen/request.go
index 5c14466866..a68feaa6f6 100644
--- a/v2/codegen/apigen/endpointgen/request.go
+++ b/v2/codegen/apigen/endpointgen/request.go
@@ -194,7 +194,7 @@ func (d *requestDesc) reqDataPathParamExpr(i int) *Statement {
 	return d.reqDataExpr().Dot(d.pathParamFieldName(i))
 }
 
-// reqDataPathParamName returns the field name for the i'th path parameter
+// pathParamFieldName returns the field name for the i'th path parameter
 // in the reqData struct.
 func (d *requestDesc) pathParamFieldName(i int) string {
 	return fmt.Sprintf("P%d", i)
diff --git a/v2/codegen/infragen/configgen/configgen.go b/v2/codegen/infragen/configgen/configgen.go
index c3f78b6f0d..7da14d8160 100644
--- a/v2/codegen/infragen/configgen/configgen.go
+++ b/v2/codegen/infragen/configgen/configgen.go
@@ -486,7 +486,7 @@ func (cb *configUnmarshalersBuilder) typeParamUnmarshalerName(param schema.DeclT
 	return fmt.Sprintf("_%s_unmarshaler", param.Name)
 }
 
-// generateConcreteUnmarshaler generates a function that unmarshals a concrete type, taking into account any
+// generateConcreteUnmarshalers generates a function that unmarshals a concrete type, taking into account any
 // type arguments passed to the given type
 func (cb *configUnmarshalersBuilder) generateConcreteUnmarshalers(typ schema.Type) {
 	funcBody, _ := cb.typeUnmarshalerFunc(typ)
diff --git a/v2/v2builder/v2builder.go b/v2/v2builder/v2builder.go
index 5523fe0c78..1d0880c8b5 100644
--- a/v2/v2builder/v2builder.go
+++ b/v2/v2builder/v2builder.go
@@ -335,7 +335,7 @@ func (i BuilderImpl) generateTestSpec(ctx context.Context, p builder.TestSpecPar
 	})
 }
 
-// testEnvVars takes a list of env vars and filters them down to the ones
+// testEnvVarsToEmbed takes a list of env vars and filters them down to the ones
 // that should be embedded within the test binary.
 func (i BuilderImpl) testEnvVarsToEmbed(args, envs []string) map[string]string {
 	if !slices.Contains(args, "-c") {