diff --git a/Makefile b/Makefile
index 2b8830e..7fa4df5 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ LICENSE_IGNORE := -e internal/testdata/
 # Set to use a different compiler. For example, `GO=go1.18rc1 make test`.
 GO ?= go
 ARGS ?= --strict_message --strict_error
-GOLANGCI_LINT_VERSION ?= v2.4.0
+GOLANGCI_LINT_VERSION ?= v2.9.0
 # Set to use a different version of protovalidate-conformance.
 # Should be kept in sync with the version referenced in buf.yaml and
 # 'buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go' in go.mod.
diff --git a/base.go b/base.go
index daaab2c..4acaac4 100644
--- a/base.go
+++ b/base.go
@@ -24,11 +24,11 @@ import (
 // base is a common struct used by all field evaluators. It holds
 // some common information used across all field evaluators.
 type base struct {
-	// Descriptor is the FieldDescriptor targeted by this evaluator, nor nil if
+	// Descriptor is the FieldDescriptor targeted by this evaluator, or nil if
 	// there is none.
 	Descriptor protoreflect.FieldDescriptor
 
-	// FieldPatht is the field path element that pertains to this evaluator, or
+	// FieldPathElement is the field path element that pertains to this evaluator, or
 	// nil if there is none.
 	FieldPathElement *validate.FieldPathElement
 
diff --git a/evaluator.go b/evaluator.go
index c02c648..d89d326 100644
--- a/evaluator.go
+++ b/evaluator.go
@@ -30,9 +30,9 @@ type evaluator interface {
 	// returning an error on the first violation. The returned error will be one
 	// of the following expected types:
 	//
-	//   - errors.ValidationError: val is invalid.
-	//   - errors.RuntimeError: error evaluating val determined at runtime.
-	//   - errors.CompilationError: this evaluator (or child evaluator) failed to
+	//   - *ValidationError: val is invalid.
+	//   - *RuntimeError: error evaluating val determined at runtime.
+	//   - *CompilationError: this evaluator (or child evaluator) failed to
 	//       build. This error is not recoverable.
 	//
 	Evaluate(msg protoreflect.Message, val protoreflect.Value, cfg *validationConfig) error