Rename error types

Sorry for the API breakage, but I like it better this way, and it's
better to fix it now before there are too many users.