Chagne tagname and add some fix to names