Added check for default template name