Merge "Rename callee save enumerators."