Fixed typos

Renamed old variables left from (possible) refactoring
Merge pull request #1 from Artazor/master

Fixed typos