PM / OPP: Rename structures for clarity