Rename methods to reflect new naming
Getting rid of more instance 'wording' usage
more of the renaming, to match the current spec wording