Merge "ASOC: macro name correction."