Refactored macro

Refactored macro names to fit naming conventions