Changed name of vars in macro.h