Renamed some methods to more appropriate names