Rename macros to conform to typical C/C++ conventions