Update email message subjects to match the new template file names