Fixed compilation error from last commit
More convinient names of variables