Renamed some methods to be more appropriate.