Added prefixes to the macros