Updated template name creation