Fixed remaining references to template: