Separate registration removed engine from the template name (#1606)