Renamed more methods for clarity.