Bugfix

Renamed some variables which were missed in a refactoring