Rename some constants, and refactor bulk email task flow.