Refactored macro.h
Renamed functions in yeti namespace