Second part of MS1->MT renaming