refactored template* class names