Design improvements to Template\Name class.