My recent experience is that the hotel seems to operate the Mayfair collection rooms as a hotel within the hotel in that you book Mayfair room the upgrade path is Mayfair to Mayfair skipping all the non renovated rooms and the same if you book a non renovated category room.