[Fixes #10] Macro Names