Extend the concepts to cover more of the terminology in use throught the spec.