Fix tag names