Fix tag creation names