Rename a few exceptions for consistency