Terminology changes and a general refactoring.