Thanks Rob!
Both options 1 and 2 worked for me. I did need to use triple braces with Tenant__r.Name field as I was getting the record ID otherwise. With the Join Text formula field I had to exclude the Date field and add that to the File Name after because the Date/time is not text and I was getting an error.
