update to use ALL_UPPER_CASE in macro as per discussion in #31