Reorganize/standardize mailers.
Fix bad naming of mailer.