Renaming errors so their names don't always end with -error.