This commit fixes the copyright year for changes made in commit 5b147bfba8. In addition, method names have been changed to reflect the semantic changes made in that same commit.
5b147bfba8