Updated terminology.