Updated nomenclature of preprocessor macros to better match project intent.