Fix macro name and align appname macros for all packages