renamed more stuff
Merge pull request #4 from johnnysnel/master

renamed more stuff