Fix for Macro Expansion Problem with 'org' name

Fixed org name shadowed problem in macros.