Reorganized Macros and fixed naming collision