Refactored template naming