Player name format and template tweaks