Remove Underscore from Macro Names