Updated field names to remove __pm from externally visible fields.