Rename m/p classes