template: name fixes