Use new email module names (#1637162, #1637159, #1637157).
6 files changed