Improves job name
XXX: Removes old email status constants