some name changes and fixes, and fix Site.current.email_host not getting updated