Renamed some methods and vars