Renamed builtin types, dropping _t