In this contribution, an alignment of the newly adopted Unified-MPM (UMPM) generation of VTM 5.0 is proposed. The proposal has two aspects. First, it is proposed to keep all the design features of the adopted UMPM and to only align the generation of the list of the five non-planar MPMs. Second, the planar flag in VTM 5.0 uses two contexts based on whether a current block is applied with Intra Sub-Partition (ISP) coding tool. In this proposal, four contexts are used by also considering the prediction mode of left and above blocks. It is reported that a combined method of these two aspects yields 0.12% coding gain in AI over VTM-5.0, with 99% encoding and 100% decoding time and that it yields … coding gain in RA over VTM-5.0, with 100% encoding and 100% decoding time. Both modifications are jointly proposed by the proponents of UMPM (JVET N0185) and MIP (JVET N0217).