Hmm,

I'd lazily overlooked the use of (our existing) templates. I used this in the contents, to be consistent with the filename replacement logic.

I agree multiple ways are bad, unless templates are rewritten I guess that's the way to go.