Rename, for reasons of least surprise.

Also, reduces confusion when combined with future pull requests.