refactored template names