Renamed/removed old terminology.