Renamed the SMTP extensions to Email to be consistent