Improve the terminology.