Changing tagged targets and build dependencies to avoid collisions