Followup, rename the macros in unstable.