Renamed some methods to be more consistent with other naming.