Renamed some types to try and get rid of the useless "PM" prefix