Followup, rename the macros in x86. >.>