Updated for consistency in terminology, de-cluttering