diff --git a/internal/inflection/singular.go b/internal/inflection/singular.go
index 6718bf7ef1..caff453489 100644
--- a/internal/inflection/singular.go
+++ b/internal/inflection/singular.go
@@ -39,5 +39,9 @@ func Singular(s SingularParams) string {
 	if strings.ToLower(s.Name) == "calories" {
 		return "calorie"
 	}
+	// Manual fix for incorrect handling of "-ves" suffix
+	if strings.ToLower(s.Name) == "waves" {
+		return "wave"
+	}
 	return upstream.Singular(s.Name)
 }