Fix macro names