Replaced macros with consts

so the compiler can do type checks and raise errors when we accidentaly try to modify one
Thanks!