Rename everything
Merge pull request #189 from GrahamCampbell/rename

Rename Everything