Fix fs_mistrust error messages and some misnamed error variants

Fixes #1473 (closed)

However, I think the prevalence of this mistake shows that we're setting ourselves up to fail. I don't think the changes I'm making here are sufficient. I will file a fresh ticket for that more open-ended problem.