Refactored template name