Thanks for the response! I'm not familiar with the macro syntax so I just tried a bunch of stuff - quotations, square brackets, curly brackets, and paras. Nothing worked.
Let me continue to try and find the right syntax before going the renaming route. I'm not quite ready to rename dozens of files and re-upload all of them just yet :) I'll send you an email if I do reach that point.
But I do love the tokens!