fix tags and names