removed name field from all templates