This. I couldn't believe they didn't have the thought to either keep the buttons in the same order or at least give players an option to change the button configuration. It is the single most disappointing thing in the Anniversary Collection, though truthfully you will get used to it after a while. I was able to finish all but 8 on that disc. At least the X collection didn't make that mistake.