Renamed some datatypes.