Fixing tag names