[Fixes #10] Macro Names

[Fixes #10] Macro Names