master
Renamed variables