fix name order of mps
merge upstream