Renamed methods to be more consistent