wee namechanges
Merge pull request #23 from MrRean/patch-1

wee namechanges