email name refactor

refactored email named to remove spaces and provide some uniformity.