Fixed typos

Renamed old variables left from (possible) refactoring