fixed macro rename bugs