All the names now fit
Merge pull request #108 from alvinsight/dev

All the names now fit