Changes in template name validation