update.xml according to new rules for naming
Merge remote-tracking branch 'origin/MPS2.5'