Renamed some typedefs: