diff --git a/modules/caddyhttp/celmatcher.go b/modules/caddyhttp/celmatcher.go
index fbc5f5a20..cc87146ec 100644
--- a/modules/caddyhttp/celmatcher.go
+++ b/modules/caddyhttp/celmatcher.go
@@ -496,7 +496,7 @@ func celMatcherStringMacroExpander(funcName string) parser.MacroExpander {
 	}
 }
 
-// celMatcherStringMacroExpander validates that the macro is called a single
+// celMatcherJSONMacroExpander validates that the macro is called a single
 // map literal argument.
 //
 // The following function call is returned: <funcName>(request, arg)
diff --git a/modules/caddyhttp/fileserver/matcher.go b/modules/caddyhttp/fileserver/matcher.go
index 1cdc87c7f..f42445fbf 100644
--- a/modules/caddyhttp/fileserver/matcher.go
+++ b/modules/caddyhttp/fileserver/matcher.go
@@ -558,7 +558,7 @@ func indexFold(haystack, needle string) int {
 	return -1
 }
 
-// isCELMapLiteral returns whether the expression resolves to a map literal containing
+// isCELTryFilesLiteral returns whether the expression resolves to a map literal containing
 // only string keys with or a placeholder call.
 func isCELTryFilesLiteral(e *exprpb.Expr) bool {
 	switch e.GetExprKind().(type) {
diff --git a/modules/caddyhttp/templates/tplcontext.go b/modules/caddyhttp/templates/tplcontext.go
index c500381e0..fb00f4fe0 100644
--- a/modules/caddyhttp/templates/tplcontext.go
+++ b/modules/caddyhttp/templates/tplcontext.go
@@ -397,7 +397,7 @@ func (c TemplateContext) funcFileExists(filename string) (bool, error) {
 	return false, nil
 }
 
-// funcStat returns Stat of a filename
+// funcFileStat returns Stat of a filename
 func (c TemplateContext) funcFileStat(filename string) (fs.FileInfo, error) {
 	if c.Root == nil {
 		return nil, fmt.Errorf("root file system not specified")