Renamed some tags