Merge "Fix macro names" into 2.0_beta