Exception name refactoring