Terminology refactor