Renamed internals