Renamed data types
fixes