fixed macro naming bug