Unify TG and VNF names in infrastructure files