Updated to be consistent with latest wording
Updates to make consistent with latest version of spec
Updates to make consistent with latest version of the doc
Updated to make consistent with latest version of spec