Revert "Change Email2 reference back to Email"

This reverts commit 5b6dfe7bda310b07b5e8f6d19ef2e6d87a2aac17.