Rename macros to use more c++ like conventions