Rename everything!
Merge pull request #28 from nickschuch/rename

Rename everything!