t3 - refactor adjusting template name and verbeage