Name switching changes, round 1.