Rename things.
Merge pull request #1 from asottile/rename

Rename things.