Add recipient name to file name in templates when emailed

It would be great to have the recipients name added to the file name in templates, specifically when the completed email is sent.  I know this can be done by adding [[Role_UserName]] in the message subject, and then manually downloading a combined PDF, but that’s several extra steps compared to just saving the completed document from the “Completed” email.

So ideally, when I receive the “Your document has been completed” email from Docusign, the attached signed document is named “[First Last] Signed Policy.pdf”.