Renaming things
Merge pull request #69 from barmstro/renaming-things

Renaming things