Renamed some inner methods.