Renamed some variables in Flow