Remove the need for template names to be specified