Renamed some types to be less verbose