Renamed functions and attributes