Renamed some more methods for improved readability