Fixes #11: Macros in module/function names

Fixes #11: Macros in module/function names