Clean up references to old name, old email
Work through email problems