Updated the exception class names