replace mvr2r_Word16() and mvr2r_Word32() by MVR2R_WORD16() and MVR2R_WORD32()...

replace mvr2r_Word16() and mvr2r_Word32() by MVR2R_WORD16() and MVR2R_WORD32() in order to be recognized as macros by the WMC tool