fixed some naming
Merge pull request #27 from Mirnoth/master

Fixed some names