Fix mailer directory and naming