Updating email alert settings
Renaming some classes for clarity