Fix naming, simplify error messages, remove heredocs.