Renamed some functions and variables