Renamed things
Merge pull request #44 from Winston-Chan/nathan

Renamed things