Fix template name structure