Shorten method names.

I tried to get clever with git-add -p, but something snuck into the last commit.