Change macro names

Change-Id: Iaf7fb54e61e91a836c4e5bbf8a3c3eb3264ad71d