change email_address to just email in multiple places