Rename M::U::P::S to M::U::S::P