Updates and simplifies terminology.