- Renamed some uffs types for wrapper.