Improvements to terminology