More updating of target names.