Minor changes to terminology.