Renamed some methods and params