Renamed some variables in engine