renaming methods, annotations and properties following discussion on the pull request