diff --git a/internal/chart/v3/lint/lint_test.go b/internal/chart/v3/lint/lint_test.go
index 9dec7d3f4..e31ee8b2f 100644
--- a/internal/chart/v3/lint/lint_test.go
+++ b/internal/chart/v3/lint/lint_test.go
@@ -234,7 +234,7 @@ func TestMalformedTemplate(t *testing.T) {
 	var values map[string]any
 	c := time.After(3 * time.Second)
 	ch := make(chan int, 1)
-	var m []support.MessageError
+	var m []support.LintMessageError
 	go func() {
 		m = RunAll(malformedTemplate, values, namespace).Messages
 		ch <- 1
diff --git a/internal/chart/v3/lint/support/message.go b/internal/chart/v3/lint/support/message.go
index 8e2dc31df..702ec888d 100644
--- a/internal/chart/v3/lint/support/message.go
+++ b/internal/chart/v3/lint/support/message.go
@@ -35,27 +35,27 @@ var sev = []string{"UNKNOWN", "INFO", "WARNING", "ERROR"}
 
 // Linter encapsulates a linting run of a particular chart.
 type Linter struct {
-	Messages []MessageError
+	Messages []LintMessageError
 	// The highest severity of all the failing lint rules
 	HighestSeverity int
 	ChartDir        string
 }
 
-// Message describes an error encountered while linting.
-type MessageError struct {
+// LintMessageError describes an error encountered while linting.
+type LintMessageError struct {
 	// Severity is one of the *Sev constants
 	Severity int
 	Path     string
 	Err      error
 }
 
-func (m MessageError) Error() string {
+func (m LintMessageError) Error() string {
 	return fmt.Sprintf("[%s] %s: %s", sev[m.Severity], m.Path, m.Err.Error())
 }
 
 // NewMessage creates a new Message struct
-func NewMessage(severity int, path string, err error) MessageError {
-	return MessageError{Severity: severity, Path: path, Err: err}
+func NewMessage(severity int, path string, err error) LintMessageError {
+	return LintMessageError{Severity: severity, Path: path, Err: err}
 }
 
 // RunLinterRule returns true if the validation passed
diff --git a/internal/chart/v3/lint/support/message_test.go b/internal/chart/v3/lint/support/message_test.go
index e859c2266..3e8ef0118 100644
--- a/internal/chart/v3/lint/support/message_test.go
+++ b/internal/chart/v3/lint/support/message_test.go
@@ -62,17 +62,17 @@ func TestRunLinterRule(t *testing.T) {
 }
 
 func TestMessage(t *testing.T) {
-	m := MessageError{ErrorSev, "Chart.yaml", errors.New("Foo")}
+	m := LintMessageError{ErrorSev, "Chart.yaml", errors.New("Foo")}
 	if m.Error() != "[ERROR] Chart.yaml: Foo" {
 		t.Errorf("Unexpected output: %s", m.Error())
 	}
 
-	m = MessageError{WarningSev, "templates/", errors.New("Bar")}
+	m = LintMessageError{WarningSev, "templates/", errors.New("Bar")}
 	if m.Error() != "[WARNING] templates/: Bar" {
 		t.Errorf("Unexpected output: %s", m.Error())
 	}
 
-	m = MessageError{InfoSev, "templates/rc.yaml", errors.New("FooBar")}
+	m = LintMessageError{InfoSev, "templates/rc.yaml", errors.New("FooBar")}
 	if m.Error() != "[INFO] templates/rc.yaml: FooBar" {
 		t.Errorf("Unexpected output: %s", m.Error())
 	}
diff --git a/internal/chart/v3/util/dependencies_test.go b/internal/chart/v3/util/dependencies_test.go
index d38113993..13e16cc15 100644
--- a/internal/chart/v3/util/dependencies_test.go
+++ b/internal/chart/v3/util/dependencies_test.go
@@ -255,7 +255,7 @@ func TestProcessDependencyImportValues(t *testing.T) {
 	case common.NoValueError:
 		// We found what we expected
 	default:
-		t.Errorf("expected an NoValueErr but got %q instead", xerr)
+		t.Errorf("expected a NoValueError but got %q instead", xerr)
 	}
 
 	c = loadChart(t, "testdata/subpop")
diff --git a/pkg/action/lint.go b/pkg/action/lint.go
index cd4a9ee0f..3057ea45c 100644
--- a/pkg/action/lint.go
+++ b/pkg/action/lint.go
@@ -43,7 +43,7 @@ type Lint struct {
 // LintResult is the result of Lint
 type LintResult struct {
 	TotalChartsLinted int
-	Messages          []support.MessageError
+	Messages          []support.LintMessageError
 	Errors            []error
 }
 
diff --git a/pkg/chart/v2/lint/lint_test.go b/pkg/chart/v2/lint/lint_test.go
index ecc0b9e6e..52dd340f5 100644
--- a/pkg/chart/v2/lint/lint_test.go
+++ b/pkg/chart/v2/lint/lint_test.go
@@ -238,7 +238,7 @@ func TestMalformedTemplate(t *testing.T) {
 	var values map[string]any
 	c := time.After(3 * time.Second)
 	ch := make(chan int, 1)
-	var m []support.MessageError
+	var m []support.LintMessageError
 	go func() {
 		m = RunAll(malformedTemplate, values, namespace).Messages
 		ch <- 1
diff --git a/pkg/chart/v2/lint/support/message.go b/pkg/chart/v2/lint/support/message.go
index 8e2dc31df..f01d7fc76 100644
--- a/pkg/chart/v2/lint/support/message.go
+++ b/pkg/chart/v2/lint/support/message.go
@@ -35,27 +35,27 @@ var sev = []string{"UNKNOWN", "INFO", "WARNING", "ERROR"}
 
 // Linter encapsulates a linting run of a particular chart.
 type Linter struct {
-	Messages []MessageError
+	Messages []LintMessageError
 	// The highest severity of all the failing lint rules
 	HighestSeverity int
 	ChartDir        string
 }
 
 // Message describes an error encountered while linting.
-type MessageError struct {
+type LintMessageError struct {
 	// Severity is one of the *Sev constants
 	Severity int
 	Path     string
 	Err      error
 }
 
-func (m MessageError) Error() string {
+func (m LintMessageError) Error() string {
 	return fmt.Sprintf("[%s] %s: %s", sev[m.Severity], m.Path, m.Err.Error())
 }
 
 // NewMessage creates a new Message struct
-func NewMessage(severity int, path string, err error) MessageError {
-	return MessageError{Severity: severity, Path: path, Err: err}
+func NewMessage(severity int, path string, err error) LintMessageError {
+	return LintMessageError{Severity: severity, Path: path, Err: err}
 }
 
 // RunLinterRule returns true if the validation passed
diff --git a/pkg/chart/v2/lint/support/message_test.go b/pkg/chart/v2/lint/support/message_test.go
index e859c2266..3e8ef0118 100644
--- a/pkg/chart/v2/lint/support/message_test.go
+++ b/pkg/chart/v2/lint/support/message_test.go
@@ -62,17 +62,17 @@ func TestRunLinterRule(t *testing.T) {
 }
 
 func TestMessage(t *testing.T) {
-	m := MessageError{ErrorSev, "Chart.yaml", errors.New("Foo")}
+	m := LintMessageError{ErrorSev, "Chart.yaml", errors.New("Foo")}
 	if m.Error() != "[ERROR] Chart.yaml: Foo" {
 		t.Errorf("Unexpected output: %s", m.Error())
 	}
 
-	m = MessageError{WarningSev, "templates/", errors.New("Bar")}
+	m = LintMessageError{WarningSev, "templates/", errors.New("Bar")}
 	if m.Error() != "[WARNING] templates/: Bar" {
 		t.Errorf("Unexpected output: %s", m.Error())
 	}
 
-	m = MessageError{InfoSev, "templates/rc.yaml", errors.New("FooBar")}
+	m = LintMessageError{InfoSev, "templates/rc.yaml", errors.New("FooBar")}
 	if m.Error() != "[INFO] templates/rc.yaml: FooBar" {
 		t.Errorf("Unexpected output: %s", m.Error())
 	}
diff --git a/pkg/chart/v2/util/dependencies_test.go b/pkg/chart/v2/util/dependencies_test.go
index 73f823e04..7b806f373 100644
--- a/pkg/chart/v2/util/dependencies_test.go
+++ b/pkg/chart/v2/util/dependencies_test.go
@@ -255,7 +255,7 @@ func TestProcessDependencyImportValues(t *testing.T) {
 	case common.NoValueError:
 		// We found what we expected
 	default:
-		t.Errorf("expected an NoValueErr but got %q instead", xerr)
+		t.Errorf("expected a NoValueError but got %q instead", xerr)
 	}
 
 	c = loadChart(t, "testdata/subpop")