Renamed some methods and variables