Allow any suffix to be passed into link formatters

And improve variable naming