refactored exception names