Renamed functions, files, and variables