Renamed some global variables