Fix macro name from  to