Make cross joins handle naming collisions