Removed setting of template name in all template generation to prevent conflicts