Making naming more consistent, round 2.