Few macro method renamed