Renamed some methods and descriptions