Reverse renaming of the error classes (matches other APIs using the same pattern/code).
Use corrected exception classes.