Renamed a few internal methods