Renamed some internals.