Renamed variables and function names