#7351: add more consistent exception name alias.
4 files changed