So HD Remix's International Controls?

I am mainly talking about the Jump/Select buttons. The last time that I played an English version of a Kingdom Hearts Game was Re:CoM, when it first came out in North America, and when I played that, I beat the game still not used to the North American Controls. I am currently playing 1.5 HD and am loving the Controls, as they are x1000 better than the original (KHFM). But my question is, seeing as how I am going to get the North American Versions of 1.5 and 2.5 HD, I want to know whether or not I am going to have to get used to the controls being X=Select and O=Jump, instead of X=Jump and O=Select like I am so accustomed to now. Are they going to keep them the way they are in Japan, or are they changing them to the International Standard like with the Original International Versions of the games?