Improve terminology