Fixed naming + merged with origin

Okay, I fixed your naming stuff and merged it into the origin repository so that it will be easy for you to make a PR ;)