Bring code in macros in accordance with the rest of the code

Basically, use the same naming conventions in macros as in the code
for better code readability and comprehension. This commit is doing
to be merged with the previous commit after review.