Don't use reserved names for macros

This commit closes issue #247