Renamed classes - removed "PM" prefix where possible